Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 42801: - Add KsMergeAutomationTables
by janderwald＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: janderwald Date: Thu Aug 20 14:11:36 2009 New Revision: 42801 URL: http://svn.reactos.org/svn/reactos?rev=42801&view=rev Log: - Add KsMergeAutomationTables Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4280… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Thu Aug 20 14:11:36 2009 @@ -3713,6 +3713,17 @@ */ #if defined(_NTDDK_) + +KSDDKAPI +NTSTATUS +NTAPI +KsMergeAutomationTables( + OUT PKSAUTOMATION_TABLE* AutomationTableAB, + IN PKSAUTOMATION_TABLE AutomationTableA OPTIONAL, + IN PKSAUTOMATION_TABLE AutomationTableB OPTIONAL, + IN KSOBJECT_BAG Bag OPTIONAL + ); + KSDDKAPI NTSTATUS NTAPI

1 0

[sginsberg] 42800: - Remove several assumptions that the default calling convention is stdcall (it isn't under gcc) - Fix even more definitions of function pointer protypes to define the calling convention compatibly for MSVC - Don't use dllexport in scsiport -- fixes linking under msvc
by sginsberg＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: sginsberg Date: Thu Aug 20 14:09:16 2009 New Revision: 42800 URL: http://svn.reactos.org/svn/reactos?rev=42800&view=rev Log: - Remove several assumptions that the default calling convention is stdcall (it isn't under gcc) - Fix even more definitions of function pointer protypes to define the calling convention compatibly for MSVC - Don't use dllexport in scsiport -- fixes linking under msvc Modified: trunk/reactos/dll/win32/psapi/psapi.c trunk/reactos/include/ddk/ntddpcm.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/parallel.h trunk/reactos/include/ddk/pfhook.h trunk/reactos/include/ddk/smbus.h trunk/reactos/include/ddk/srb.h trunk/reactos/include/ddk/storport.h trunk/reactos/include/ddk/usbcamdi.h trunk/reactos/include/ddk/video.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/ldrtypes.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/include/psdk/ntsecapi.h trunk/reactos/include/psdk/psapi.h trunk/reactos/include/psdk/wintrust.h trunk/reactos/include/psdk/winwlx.h Modified: trunk/reactos/dll/win32/psapi/psapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/psapi.c?re… ============================================================================== --- trunk/reactos/dll/win32/psapi/psapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/psapi/psapi.c [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -587,7 +587,7 @@ } INTERNAL_ENUM_PAGE_FILES_CONTEXT, *PINTERNAL_ENUM_PAGE_FILES_CONTEXT; -static BOOL +static BOOL CALLBACK InternalAnsiPageFileCallback(LPVOID pContext, PENUM_PAGE_FILE_INFORMATION pPageFileInfo, LPCWSTR lpFilename) Modified: trunk/reactos/include/ddk/ntddpcm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddpcm.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntddpcm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddpcm.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -90,8 +90,8 @@ typedef ULONG MEMORY_SPACE; -typedef ULONG NTAPI -(*PPCMCIA_READ_WRITE_CONFIG)( +typedef ULONG +(NTAPI *PPCMCIA_READ_WRITE_CONFIG)( IN PVOID Context, IN ULONG WhichSpace, IN PUCHAR Buffer, @@ -117,8 +117,8 @@ #define PCMCIA_MEMORY_8BIT_ACCESS 0 #define PCMCIA_MEMORY_16BIT_ACCESS 1 -typedef BOOLEAN NTAPI -(*PPCMCIA_MODIFY_MEMORY_WINDOW)( +typedef BOOLEAN +(NTAPI *PPCMCIA_MODIFY_MEMORY_WINDOW)( IN PVOID Context, IN ULONGLONG HostBase, IN ULONGLONG CardBase, @@ -132,13 +132,13 @@ #define PCMCIA_VPP_12V 1 #define PCMCIA_VPP_IS_VCC 2 -typedef BOOLEAN NTAPI -(*PPCMCIA_SET_VPP)( +typedef BOOLEAN +(NTAPI *PPCMCIA_SET_VPP)( IN PVOID Context, IN UCHAR VppLevel); -typedef BOOLEAN NTAPI -(*PPCMCIA_IS_WRITE_PROTECTED)( +typedef BOOLEAN +(NTAPI *PPCMCIA_IS_WRITE_PROTECTED)( IN PVOID Context); typedef struct _PCMCIA_INTERFACE_STANDARD { Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -2378,7 +2378,7 @@ OUT PIO_STATUS_BLOCK IoStatus OPTIONAL ); -typedef VOID (*PDIRTY_PAGE_ROUTINE) ( +typedef VOID (NTAPI *PDIRTY_PAGE_ROUTINE) ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -3601,7 +3601,7 @@ IN PVOID FsContext ); -typedef BOOLEAN (*PCHECK_FOR_TRAVERSE_ACCESS) ( +typedef BOOLEAN (NTAPI *PCHECK_FOR_TRAVERSE_ACCESS) ( IN PVOID NotifyContext, IN PVOID TargetContext, IN PSECURITY_SUBJECT_CONTEXT SubjectContext @@ -5522,7 +5522,7 @@ ((PSECURITY_SUBJECT_CONTEXT) SubjectContext)->ClientToken : \ ((PSECURITY_SUBJECT_CONTEXT) SubjectContext)->PrimaryToken ) -typedef NTSTATUS (*PSE_LOGON_SESSION_TERMINATED_ROUTINE) ( +typedef NTSTATUS (NTAPI *PSE_LOGON_SESSION_TERMINATED_ROUTINE) ( IN PLUID LogonId ); Modified: trunk/reactos/include/ddk/parallel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/parallel.h?rev… ============================================================================== --- trunk/reactos/include/ddk/parallel.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/parallel.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -79,28 +79,28 @@ KINTERRUPT_MODE InterruptMode; } MORE_PARALLEL_PORT_INFORMATION, *PMORE_PARALLEL_PORT_INFORMATION; -typedef NTSTATUS DDKAPI -(*PPARALLEL_SET_CHIP_MODE)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_SET_CHIP_MODE)( IN PVOID SetChipContext, IN UCHAR ChipMode); -typedef NTSTATUS DDKAPI -(*PPARALLEL_CLEAR_CHIP_MODE)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_CLEAR_CHIP_MODE)( IN PVOID ClearChipContext, IN UCHAR ChipMode); -typedef NTSTATUS DDKAPI -(*PPARCHIP_CLEAR_CHIP_MODE)( +typedef NTSTATUS +(DDKAPI *PPARCHIP_CLEAR_CHIP_MODE)( IN PVOID ClearChipContext, IN UCHAR ChipMode); -typedef NTSTATUS DDKAPI -(*PPARALLEL_TRY_SELECT_ROUTINE)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_TRY_SELECT_ROUTINE)( IN PVOID TrySelectContext, IN PVOID TrySelectCommand); -typedef NTSTATUS DDKAPI -(*PPARALLEL_DESELECT_ROUTINE)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_DESELECT_ROUTINE)( IN PVOID DeselectContext, IN PVOID DeselectCommand); @@ -133,16 +133,16 @@ PWSTR PortName; } PARALLEL_PNP_INFORMATION, *PPARALLEL_PNP_INFORMATION; -typedef BOOLEAN DDKAPI -(*PPARALLEL_TRY_ALLOCATE_ROUTINE)( +typedef BOOLEAN +(DDKAPI *PPARALLEL_TRY_ALLOCATE_ROUTINE)( IN PVOID TryAllocateContext); -typedef VOID DDKAPI -(*PPARALLEL_FREE_ROUTINE)( +typedef VOID +(DDKAPI *PPARALLEL_FREE_ROUTINE)( IN PVOID FreeContext); -typedef ULONG DDKAPI -(*PPARALLEL_QUERY_WAITERS_ROUTINE)( +typedef ULONG +(DDKAPI *PPARALLEL_QUERY_WAITERS_ROUTINE)( IN PVOID QueryAllocsContext); typedef struct _PARALLEL_PORT_INFORMATION { @@ -164,8 +164,8 @@ BOOLEAN success; } PARALLEL_CHIP_MODE, *PPARALLEL_CHIP_MODE; -typedef VOID DDKAPI -(*PPARALLEL_DEFERRED_ROUTINE)( +typedef VOID +(DDKAPI *PPARALLEL_DEFERRED_ROUTINE)( IN PVOID DeferredContext); typedef struct _PARALLEL_INTERRUPT_SERVICE_ROUTINE { @@ -191,8 +191,8 @@ #define IOCTL_INTERNAL_UNLOCK_PORT_NO_DESELECT \ CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 53, METHOD_BUFFERED, FILE_ANY_ACCESS) -typedef USHORT DDKAPI -(*PDETERMINE_IEEE_MODES)( +typedef USHORT +(DDKAPI *PDETERMINE_IEEE_MODES)( IN PVOID Context); typedef enum _PARALLEL_SAFETY { @@ -200,49 +200,49 @@ UNSAFE_MODE } PARALLEL_SAFETY; -typedef NTSTATUS DDKAPI -(*PNEGOTIATE_IEEE_MODE)( +typedef NTSTATUS +(DDKAPI *PNEGOTIATE_IEEE_MODE)( IN PVOID Context, IN USHORT ModeMaskFwd, IN USHORT ModeMaskRev, IN PARALLEL_SAFETY ModeSafety, IN BOOLEAN IsForward); -typedef NTSTATUS DDKAPI -(*PTERMINATE_IEEE_MODE)( +typedef NTSTATUS +(DDKAPI *PTERMINATE_IEEE_MODE)( IN PVOID Context); -typedef NTSTATUS DDKAPI -(*PPARALLEL_IEEE_FWD_TO_REV)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_IEEE_FWD_TO_REV)( IN PVOID Context); -typedef NTSTATUS DDKAPI -(*PPARALLEL_IEEE_REV_TO_FWD)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_IEEE_REV_TO_FWD)( IN PVOID Context); -typedef NTSTATUS DDKAPI -(*PPARALLEL_READ)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_READ)( IN PVOID Context, OUT PVOID Buffer, IN ULONG NumBytesToRead, OUT PULONG NumBytesRead, IN UCHAR Channel); -typedef NTSTATUS DDKAPI -(*PPARALLEL_WRITE)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_WRITE)( IN PVOID Context, OUT PVOID Buffer, IN ULONG NumBytesToWrite, OUT PULONG NumBytesWritten, IN UCHAR Channel); -typedef NTSTATUS DDKAPI -(*PPARALLEL_TRYSELECT_DEVICE)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_TRYSELECT_DEVICE)( IN PVOID Context, IN PARALLEL_1284_COMMAND Command); -typedef NTSTATUS DDKAPI -(*PPARALLEL_DESELECT_DEVICE)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_DESELECT_DEVICE)( IN PVOID Context, IN PARALLEL_1284_COMMAND Command); Modified: trunk/reactos/include/ddk/pfhook.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/pfhook.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/pfhook.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/pfhook.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -41,8 +41,8 @@ PF_ICMP_ON_DROP = 3 } PF_FORWARD_ACTION; -typedef PF_FORWARD_ACTION NTAPI -(*PacketFilterExtensionPtr)( +typedef PF_FORWARD_ACTION +(NTAPI *PacketFilterExtensionPtr)( IN unsigned char *PacketHeader, IN unsigned char *Packet, IN unsigned int PacketLength, Modified: trunk/reactos/include/ddk/smbus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/smbus.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/smbus.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/smbus.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -82,8 +82,8 @@ UCHAR Data[SMB_MAX_DATA_SIZE]; } SMB_REQUEST, *PSMB_REQUEST; -typedef VOID NTAPI -(*SMB_ALARM_NOTIFY)( +typedef VOID +(NTAPI *SMB_ALARM_NOTIFY)( PVOID Context, UCHAR Address, USHORT Data); @@ -99,18 +99,18 @@ #define SMB_CLASS_MAJOR_VERSION 0x0001 #define SMB_CLASS_MINOR_VERSION 0x0000 -typedef NTSTATUS DDKAPI -(*SMB_RESET_DEVICE)( +typedef NTSTATUS +(DDKAPI *SMB_RESET_DEVICE)( IN struct _SMB_CLASS *SmbClass, IN PVOID SmbMiniport); -typedef VOID DDKAPI -(*SMB_START_IO)( +typedef VOID +(DDKAPI *SMB_START_IO)( IN struct _SMB_CLASS *SmbClass, IN PVOID SmbMiniport); -typedef NTSTATUS DDKAPI -(*SMB_STOP_DEVICE)( +typedef NTSTATUS +(DDKAPI *SMB_STOP_DEVICE)( IN struct _SMB_CLASS *SmbClass, IN PVOID SmbMiniport); @@ -142,8 +142,8 @@ SmbClassCompleteRequest( IN PSMB_CLASS SmbClass); -typedef NTSTATUS DDKAPI -(*PSMB_INITIALIZE_MINIPORT)( +typedef NTSTATUS +(DDKAPI *PSMB_INITIALIZE_MINIPORT)( IN PSMB_CLASS SmbClass, IN PVOID MiniportExtension, IN PVOID MiniportContext); Modified: trunk/reactos/include/ddk/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/srb.h?rev=4280… ============================================================================== --- trunk/reactos/include/ddk/srb.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/srb.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -28,7 +28,7 @@ #endif #if defined(_SCSIPORT_) - #define SCSIPORTAPI DECLSPEC_EXPORT + #define SCSIPORTAPI #else #define SCSIPORTAPI DECLSPEC_IMPORT #endif Modified: trunk/reactos/include/ddk/storport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/storport.h?rev… ============================================================================== --- trunk/reactos/include/ddk/storport.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/storport.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -391,8 +391,8 @@ IN PVOID DeviceExtension, IN PSCSI_REQUEST_BLOCK Srb); -typedef BOOLEAN DDKAPI -(*PSTOR_SYNCHRONIZED_ACCESS)( +typedef BOOLEAN +(DDKAPI *PSTOR_SYNCHRONIZED_ACCESS)( IN PVOID HwDeviceExtension, IN PVOID Context); Modified: trunk/reactos/include/ddk/usbcamdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbcamdi.h?rev… ============================================================================== --- trunk/reactos/include/ddk/usbcamdi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/usbcamdi.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -74,23 +74,23 @@ USBCAMD_CamControlFlag_EnableDeviceEvents = 8 } USBCAMD_CamControlFlags; -typedef NTSTATUS DDKAPI -(*PCAM_ALLOCATE_BW_ROUTINE)( +typedef NTSTATUS +(DDKAPI *PCAM_ALLOCATE_BW_ROUTINE)( PDEVICE_OBJECT BusDeviceObject, PVOID DeviceContext, PULONG RawFrameLength, PVOID Format); -typedef NTSTATUS DDKAPI -(*PCAM_ALLOCATE_BW_ROUTINE_EX)( +typedef NTSTATUS +(DDKAPI *PCAM_ALLOCATE_BW_ROUTINE_EX)( PDEVICE_OBJECT BusDeviceObject, PVOID DeviceContext, PULONG RawFrameLength, PVOID Format, ULONG StreamNumber); -typedef NTSTATUS DDKAPI -(*PCAM_CONFIGURE_ROUTINE)( +typedef NTSTATUS +(DDKAPI *PCAM_CONFIGURE_ROUTINE)( PDEVICE_OBJECT BusDeviceObject, PVOID DeviceContext, PUSBD_INTERFACE_INFORMATION Interface, @@ -98,8 +98,8 @@ PLONG DataPipeIndex, PLONG SyncPipeIndex); -typedef NTSTATUS DDKAPI -(*PCAM_CONFIGURE_ROUTINE_EX)( +typedef NTSTATUS +(DDKAPI *PCAM_CONFIGURE_ROUTINE_EX)( PDEVICE_OBJECT BusDeviceObject, PVOID DeviceContext, PUSBD_INTERFACE_INFORMATION Interface, @@ -108,36 +108,36 @@ PUSBCAMD_Pipe_Config_Descriptor PipeConfig, PUSB_DEVICE_DESCRIPTOR DeviceDescriptor); -typedef NTSTATUS DDKAPI -(*PCAM_FREE_BW_ROUTINE)( - PDEVICE_OBJECT BusDeviceObject, - PVOID DeviceContext); - -typedef NTSTATUS DDKAPI -(*PCAM_FREE_BW_ROUTINE_EX)( - PDEVICE_OBJECT BusDeviceObject, - PVOID DeviceContext, - ULONG StreamNumber); - -typedef NTSTATUS DDKAPI -(*PCAM_INITIALIZE_ROUTINE)( - PDEVICE_OBJECT BusDeviceObject, - PVOID DeviceContext); - -typedef VOID DDKAPI -(*PCAM_NEW_FRAME_ROUTINE)( +typedef NTSTATUS +(DDKAPI *PCAM_FREE_BW_ROUTINE)( + PDEVICE_OBJECT BusDeviceObject, + PVOID DeviceContext); + +typedef NTSTATUS +(DDKAPI *PCAM_FREE_BW_ROUTINE_EX)( + PDEVICE_OBJECT BusDeviceObject, + PVOID DeviceContext, + ULONG StreamNumber); + +typedef NTSTATUS +(DDKAPI *PCAM_INITIALIZE_ROUTINE)( + PDEVICE_OBJECT BusDeviceObject, + PVOID DeviceContext); + +typedef VOID +(DDKAPI *PCAM_NEW_FRAME_ROUTINE)( PVOID DeviceContext, PVOID FrameContext); -typedef VOID DDKAPI -(*PCAM_NEW_FRAME_ROUTINE_EX)( +typedef VOID +(DDKAPI *PCAM_NEW_FRAME_ROUTINE_EX)( PVOID DeviceContext, PVOID FrameContext, ULONG StreamNumber, PULONG FrameLength); -typedef NTSTATUS DDKAPI -(*PCAM_PROCESS_RAW_FRAME_ROUTINE)( +typedef NTSTATUS +(DDKAPI *PCAM_PROCESS_RAW_FRAME_ROUTINE)( PDEVICE_OBJECT BusDeviceObject, PVOID DeviceContext, PVOID FrameContext, @@ -148,8 +148,8 @@ ULONG NumberOfPackets, PULONG BytesReturned); -typedef NTSTATUS DDKAPI -(*PCAM_PROCESS_RAW_FRAME_ROUTINE_EX)( +typedef NTSTATUS +(DDKAPI *PCAM_PROCESS_RAW_FRAME_ROUTINE_EX)( PDEVICE_OBJECT BusDeviceObject, PVOID DeviceContext, PVOID FrameContext, @@ -162,8 +162,8 @@ ULONG ActualRawFrameLength, ULONG StreamNumber); -typedef ULONG DDKAPI -(*PCAM_PROCESS_PACKET_ROUTINE)( +typedef ULONG +(DDKAPI *PCAM_PROCESS_PACKET_ROUTINE)( PDEVICE_OBJECT BusDeviceObject, PVOID DeviceContext, PVOID CurrentFrameContext, @@ -174,8 +174,8 @@ PBOOLEAN FrameComplete, PBOOLEAN NextFrameIsStill); -typedef ULONG DDKAPI -(*PCAM_PROCESS_PACKET_ROUTINE_EX)( +typedef ULONG +(DDKAPI *PCAM_PROCESS_PACKET_ROUTINE_EX)( PDEVICE_OBJECT BusDeviceObject, PVOID DeviceContext, PVOID CurrentFrameContext, @@ -187,29 +187,29 @@ PULONG PacketFlag, PULONG ValidDataOffset); -typedef NTSTATUS DDKAPI -(*PCAM_STATE_ROUTINE)( - PDEVICE_OBJECT BusDeviceObject, - PVOID DeviceContext); - -typedef NTSTATUS DDKAPI -(*PCAM_START_CAPTURE_ROUTINE)( - PDEVICE_OBJECT BusDeviceObject, - PVOID DeviceContext); - -typedef NTSTATUS DDKAPI -(*PCAM_START_CAPTURE_ROUTINE_EX)( - PDEVICE_OBJECT BusDeviceObject, - PVOID DeviceContext, - ULONG StreamNumber); - -typedef NTSTATUS DDKAPI -(*PCAM_STOP_CAPTURE_ROUTINE)( - PDEVICE_OBJECT BusDeviceObject, - PVOID DeviceContext); - -typedef NTSTATUS DDKAPI -(*PCAM_STOP_CAPTURE_ROUTINE_EX)( +typedef NTSTATUS +(DDKAPI *PCAM_STATE_ROUTINE)( + PDEVICE_OBJECT BusDeviceObject, + PVOID DeviceContext); + +typedef NTSTATUS +(DDKAPI *PCAM_START_CAPTURE_ROUTINE)( + PDEVICE_OBJECT BusDeviceObject, + PVOID DeviceContext); + +typedef NTSTATUS +(DDKAPI *PCAM_START_CAPTURE_ROUTINE_EX)( + PDEVICE_OBJECT BusDeviceObject, + PVOID DeviceContext, + ULONG StreamNumber); + +typedef NTSTATUS +(DDKAPI *PCAM_STOP_CAPTURE_ROUTINE)( + PDEVICE_OBJECT BusDeviceObject, + PVOID DeviceContext); + +typedef NTSTATUS +(DDKAPI *PCAM_STOP_CAPTURE_ROUTINE_EX)( PDEVICE_OBJECT BusDeviceObject, PVOID DeviceContext, ULONG StreamNumber); @@ -255,14 +255,14 @@ IN ULONG Version, IN ULONG CamControlFlag); -typedef VOID DDKAPI -(*PCOMMAND_COMPLETE_FUNCTION)( +typedef VOID +(DDKAPI *PCOMMAND_COMPLETE_FUNCTION)( PVOID DeviceContext, PVOID CommandContext, NTSTATUS NtStatus); -typedef NTSTATUS DDKAPI -(*PFNUSBCAMD_BulkReadWrite)( +typedef NTSTATUS +(DDKAPI *PFNUSBCAMD_BulkReadWrite)( IN PVOID DeviceContext, IN USHORT PipeIndex, IN PVOID Buffer, @@ -270,23 +270,23 @@ IN PCOMMAND_COMPLETE_FUNCTION CommandComplete, IN PVOID CommandContext); -typedef NTSTATUS DDKAPI -(*PFNUSBCAMD_SetIsoPipeState)( +typedef NTSTATUS +(DDKAPI *PFNUSBCAMD_SetIsoPipeState)( IN PVOID DeviceContext, IN ULONG PipeStateFlags); -typedef NTSTATUS DDKAPI -(*PFNUSBCAMD_CancelBulkReadWrite)( +typedef NTSTATUS +(DDKAPI *PFNUSBCAMD_CancelBulkReadWrite)( IN PVOID DeviceContext, IN ULONG PipeIndex); -typedef NTSTATUS DDKAPI -(*PFNUSBCAMD_SetVideoFormat)( +typedef NTSTATUS +(DDKAPI *PFNUSBCAMD_SetVideoFormat)( IN PVOID DeviceContext, IN PHW_STREAM_REQUEST_BLOCK pSrb); -typedef NTSTATUS DDKAPI -(*PFNUSBCAMD_WaitOnDeviceEvent)( +typedef NTSTATUS +(DDKAPI *PFNUSBCAMD_WaitOnDeviceEvent)( IN PVOID DeviceContext, IN ULONG PipeIndex, IN PVOID Buffer, @@ -318,8 +318,8 @@ IN PCOMMAND_COMPLETE_FUNCTION CommandComplete, IN PVOID CommandContext); -typedef VOID DDKAPI -(*PADAPTER_RECEIVE_PACKET_ROUTINE)( +typedef VOID +(DDKAPI *PADAPTER_RECEIVE_PACKET_ROUTINE)( IN PHW_STREAM_REQUEST_BLOCK Srb); USBCAMAPI @@ -360,8 +360,8 @@ PFNUSBCAMD_CancelBulkReadWrite USBCAMD_CancelBulkReadWrite; } USBCAMD_INTERFACE, *PUSBCAMD_INTERFACE; -typedef VOID DDKAPI -(*PSTREAM_RECEIVE_PACKET)( +typedef VOID +(DDKAPI *PSTREAM_RECEIVE_PACKET)( IN PVOID Srb, IN PVOID DeviceContext, IN PBOOLEAN Completed); Modified: trunk/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/video.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/video.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/video.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -76,7 +76,7 @@ } HW_DMA_RETURN, *PHW_DMA_RETURN; typedef HW_DMA_RETURN -(*PVIDEO_HW_START_DMA)( +(DDKAPI *PVIDEO_HW_START_DMA)( PVOID HwDeviceExtension, PDMA pDma); Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -4948,7 +4948,7 @@ } PHYSICAL_MEMORY_RANGE, *PPHYSICAL_MEMORY_RANGE; typedef ULONG_PTR -(*PDRIVER_VERIFIER_THUNK_ROUTINE)( +(NTAPI *PDRIVER_VERIFIER_THUNK_ROUTINE)( IN PVOID Context); typedef struct _DRIVER_VERIFIER_THUNK_PAIRS { Modified: trunk/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -156,7 +156,7 @@ } LDR_DLL_LOADED_NOTIFICATION_DATA, *PLDR_DLL_LOADED_NOTIFICATION_DATA; typedef VOID -(*PLDR_DLL_LOADED_NOTIFICATION_CALLBACK)( +(NTAPI *PLDR_DLL_LOADED_NOTIFICATION_CALLBACK)( IN BOOLEAN Type, IN struct _LDR_DLL_LOADED_NOTIFICATION_DATA *Data ); Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -435,7 +435,7 @@ // Callback for RTL Heap Enumeration // typedef NTSTATUS -(*PHEAP_ENUMERATION_ROUTINE)( +(NTAPI *PHEAP_ENUMERATION_ROUTINE)( IN PVOID HeapHandle, IN PVOID UserParam ); Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -728,10 +728,10 @@ TRUSTED_INFORMATION_CLASS,PVOID); NTSTATUS NTAPI LsaStorePrivateData(LSA_HANDLE,PLSA_UNICODE_STRING, PLSA_UNICODE_STRING); -typedef NTSTATUS (*PSAM_PASSWORD_NOTIFICATION_ROUTINE)(PUNICODE_STRING, +typedef NTSTATUS (NTAPI *PSAM_PASSWORD_NOTIFICATION_ROUTINE)(PUNICODE_STRING, ULONG,PUNICODE_STRING); -typedef BOOLEAN (*PSAM_INIT_NOTIFICATION_ROUTINE)(void); -typedef BOOLEAN (*PSAM_PASSWORD_FILTER_ROUTINE)(PUNICODE_STRING,PUNICODE_STRING, +typedef BOOLEAN (NTAPI *PSAM_INIT_NOTIFICATION_ROUTINE)(void); +typedef BOOLEAN (NTAPI *PSAM_PASSWORD_FILTER_ROUTINE)(PUNICODE_STRING,PUNICODE_STRING, PUNICODE_STRING,BOOLEAN); #ifdef __cplusplus } Modified: trunk/reactos/include/psdk/psapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psapi.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/psapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/psapi.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -72,8 +72,8 @@ SIZE_T PeakUsage; } ENUM_PAGE_FILE_INFORMATION, *PENUM_PAGE_FILE_INFORMATION; -typedef BOOL (*PENUM_PAGE_FILE_CALLBACKA)(LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCSTR); -typedef BOOL (*PENUM_PAGE_FILE_CALLBACKW)(LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCWSTR); +typedef BOOL (CALLBACK *PENUM_PAGE_FILE_CALLBACKA)(LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCSTR); +typedef BOOL (CALLBACK *PENUM_PAGE_FILE_CALLBACKW)(LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCWSTR); /* Grouped by application,not in alphabetical order. */ BOOL WINAPI EnumProcesses(DWORD *,DWORD,DWORD *); Modified: trunk/reactos/include/psdk/wintrust.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wintrust.h?re… ============================================================================== --- trunk/reactos/include/psdk/wintrust.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wintrust.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -371,7 +371,7 @@ #define CPD_UISTATE_MODE_ALLOW 0x00000002 #define CPD_UISTATE_MODE_MASK 0x00000003 -typedef BOOL (*PFN_PROVUI_CALL)(HWND hWndSecurityDialog, +typedef BOOL (CALLBACK *PFN_PROVUI_CALL)(HWND hWndSecurityDialog, struct _CRYPT_PROVIDER_DATA *pProvData); typedef struct _CRYPT_PROVUI_FUNCS { Modified: trunk/reactos/include/psdk/winwlx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winwlx.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winwlx.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winwlx.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -633,7 +633,7 @@ /* non-GINA notification DLLs*/ typedef -DWORD (*PFNMSGECALLBACK)( +DWORD (CALLBACK *PFNMSGECALLBACK)( BOOL bVerbose, LPWSTR lpMessage);

1 0

[janderwald] 42799: - Add types for bda driver
by janderwald＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: janderwald Date: Thu Aug 20 13:55:42 2009 New Revision: 42799 URL: http://svn.reactos.org/svn/reactos?rev=42799&view=rev Log: - Add types for bda driver Modified: trunk/reactos/include/dxsdk/bdamedia.h Modified: trunk/reactos/include/dxsdk/bdamedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/bdamedia.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] Thu Aug 20 13:55:42 2009 @@ -1,11 +1,5 @@ #ifndef BDAMEDIA_H__ #define BDAMEDIA_H__ - -typedef enum -{ - KSPROPERTY_BDA_PIN_ID = 0, - KSPROPERTY_BDA_PIN_TYPE -} KSPROPERTY_BDA_PIN_CONTROL; typedef struct _KSP_BDA_NODE_PIN { KSPROPERTY Property; @@ -174,5 +168,37 @@ 0,\ SupportHandler) +/* ------------------------------------------------------------ + BDA Pin Control Property {0DED49D5-A8B7-4d5d-97A1-12B0C195874D} +*/ + +#define STATIC_KSPROPSETID_BdaPinControl \ + 0xded49d5, 0xa8b7, 0x4d5d, 0x97, 0xa1, 0x12, 0xb0, 0xc1, 0x95, 0x87, 0x4d +DEFINE_GUIDSTRUCT("0DED49D5-A8B7-4d5d-97A1-12B0C195874D", KSPROPSETID_BdaPinControl); +#define KSPROPSETID_BdaPinControl DEFINE_GUIDNAMED(KSPROPSETID_BdaPinControl) + +typedef enum { + KSPROPERTY_BDA_PIN_ID = 0, + KSPROPERTY_BDA_PIN_TYPE +} KSPROPERTY_BDA_PIN_CONTROL; + +#define DEFINE_KSPROPERTY_ITEM_BDA_PIN_ID(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_PIN_ID,\ + (GetHandler),\ + sizeof( KSPROPERTY),\ + sizeof( ULONG),\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_PIN_TYPE(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_PIN_TYPE,\ + (GetHandler),\ + sizeof( KSPROPERTY),\ + sizeof( ULONG),\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + #endif

1 0

[cwittich] 42798: sync credui with wine 1.1.27
by cwittich＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: cwittich Date: Thu Aug 20 13:41:11 2009 New Revision: 42798 URL: http://svn.reactos.org/svn/reactos?rev=42798&view=rev Log: sync credui with wine 1.1.27 Modified: trunk/reactos/dll/win32/credui/credui_Da.rc trunk/reactos/dll/win32/credui/credui_De.rc trunk/reactos/dll/win32/credui/credui_En.rc trunk/reactos/dll/win32/credui/credui_Es.rc trunk/reactos/dll/win32/credui/credui_Fr.rc trunk/reactos/dll/win32/credui/credui_Ko.rc trunk/reactos/dll/win32/credui/credui_Lt.rc trunk/reactos/dll/win32/credui/credui_Nl.rc trunk/reactos/dll/win32/credui/credui_No.rc trunk/reactos/dll/win32/credui/credui_Pl.rc trunk/reactos/dll/win32/credui/credui_Pt.rc trunk/reactos/dll/win32/credui/credui_Ro.rc trunk/reactos/dll/win32/credui/credui_Ru.rc trunk/reactos/dll/win32/credui/credui_Si.rc trunk/reactos/dll/win32/credui/credui_Sv.rc trunk/reactos/dll/win32/credui/credui_Zh.rc trunk/reactos/dll/win32/credui/credui_resources.h Modified: trunk/reactos/dll/win32/credui/credui_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Da… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Da.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/credui/credui_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_De… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_De.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" + +#pragma code_page(65001) LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -44,7 +48,7 @@ IDS_TITLEFORMAT "Mit %s verbinden" IDS_MESSAGEFORMAT "Verbindung mit %s wird hergestellt" IDS_INCORRECTPASSWORDTITLE "Anmeldung fehlgeschlagen" - IDS_INCORRECTPASSWORD "Bitte überprüfen Sie Ihren Benutzernamen\nund geben Sie das Kennwort neu ein." + IDS_INCORRECTPASSWORD "Bitte Ã¼berprÃ¼fen Sie Ihren Benutzernamen\nund geben Sie das Kennwort neu ein." IDS_CAPSLOCKONTITLE "Die Feststelltaste ist aktiviert" - IDS_CAPSLOCKON "Mit aktivierter Feststelltaste könnte das Kennwort falsch eingeben werden.\n\nVor der Eingabe des Kennworts sollten Sie die Feststelltaste deaktivieren." + IDS_CAPSLOCKON "Mit aktivierter Feststelltaste kÃ¶nnte das Kennwort falsch eingeben werden.\n\nVor der Eingabe des Kennworts sollten Sie die Feststelltaste deaktivieren." } Modified: trunk/reactos/dll/win32/credui/credui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_En… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_En.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/credui/credui_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Es… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Es.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -18,6 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" + #pragma code_page(65001) LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -50,5 +53,3 @@ IDS_CAPSLOCKONTITLE "Bloq Mayus estÃ¡ activado" IDS_CAPSLOCKON "El Bloq Mayus activado puede hacer que entre su contraseÃ±a incorrectamente.\n\nPulse la tecla Bloq Mayus de su teclado para desactivar Bloq Mayus antes\n de introducir su contraseÃ±a." } - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/credui/credui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Fr… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Fr.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" + #pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -49,5 +52,4 @@ IDS_CAPSLOCKONTITLE "VERR.MAJ est activÃ©" IDS_CAPSLOCKON "Le verrouillage majuscule Ã©tant activÃ©, cela pourrait provoquer une erreur lors de la saisie de votre mot de passe.\n\nAppuyez sur la touche VERR.MAJ de votre clavier afin de dÃ©sactiver le verrouilage majuscule avant\nde saisir votre mot de passe." } - #pragma code_page(default) Modified: trunk/reactos/dll/win32/credui/credui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Ko… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Ko.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -18,6 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/credui/credui_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Lt… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Lt.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" /* UTF-8 */ #pragma code_page(65001) @@ -51,5 +53,4 @@ IDS_CAPSLOCKONTITLE "DidÅ¾iÅ³jÅ³ raidÅ¾iÅ³ bÅ«sena Ä¯jungta" IDS_CAPSLOCKON "Kai Ä¯jungta didÅ¾iÅ³jÅ³ raidÅ¾iÅ³ bÅ«sena, savo slaptaÅ¾odÄ¯ galite Ä¯vesti neteisingai.\n\nPaspauskite didÅ¾iÅ³jÅ³ raidÅ¾iÅ³ klaviatÅ«ros klaviÅ¡Ä didÅ¾iÅ³jÅ³ raidÅ¾iÅ³ bÅ«senai iÅ¡jungti\nprieÅ¡ rinkdami savo slaptaÅ¾odÄ¯." } - #pragma code_page(default) Modified: trunk/reactos/dll/win32/credui/credui_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Nl… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Nl.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/credui/credui_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_No… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_No.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/credui/credui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Pl… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Pl.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -18,6 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/credui/credui_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Pt… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Pt.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/credui/credui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Ro… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Ro.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -16,6 +16,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -49,5 +51,3 @@ IDS_CAPSLOCKONTITLE "Tasta Caps Lock este activatÄ" IDS_CAPSLOCKON "Cu tasta Caps Lock activatÄ este foarte probabil cÄ veÈi introduce parola greÈit.\n\nInainte de a introduce parola apÄsaÈi tasta Caps Lock pentru a dezactiva scrierea cu majuscule." } - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/credui/credui_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Ru… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Ru.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -18,6 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 @@ -28,23 +33,23 @@ CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, 0,213,37 LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "Ïî&ëüçîâàòåëü:",-1,8,62,72,12,SS_CENTERIMAGE + LTEXT "ÐÐ¾&Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:",-1,8,62,72,12,SS_CENTERIMAGE CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&Ïàðîëü:",-1,8,80,72,12,SS_CENTERIMAGE + LTEXT "&ÐÐ°ÑÐ¾Ð»Ñ:",-1,8,80,72,12,SS_CENTERIMAGE EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "Ñî&õðàíèòü ïàðîëü",IDC_SAVE,"Button", + CONTROL "Ð¡Ð¾&ÑÑÐ°Ð½Ð¸ÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ",IDC_SAVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "ÎÊ",IDOK,97,128,50,14 - PUSHBUTTON "Îòìåíà",IDCANCEL,156,128,50,14 + DEFPUSHBUTTON "ÐÐ",IDOK,97,128,50,14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL,156,128,50,14 END STRINGTABLE DISCARDABLE { - IDS_TITLEFORMAT "Ïîäêëþ÷åíèå ê %s" - IDS_MESSAGEFORMAT "Ïîäêëþ÷åíèå ê %s" - IDS_INCORRECTPASSWORDTITLE "Âõîä íå áûë ïðîèçâåä¸í" - IDS_INCORRECTPASSWORD "Óáåäèòåñü, ÷òî èìÿ ïîëüçîâàòåëÿ\nè ïàðîëü âåðíû." - IDS_CAPSLOCKONTITLE "Caps Lock âêëþ÷åí" - IDS_CAPSLOCKON "Ïàðîëü ìîæåò áûòü ââåä¸í íåïðàâèëüíî èç-çà íàæàòîé êëàâèøè Caps Lock.\n\nÎòêëþ÷èòå Caps Lock ïåðåä òåì, êàê ââîäèòü ïàðîëü." + IDS_TITLEFORMAT "ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ðº %s" + IDS_MESSAGEFORMAT "ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ðº %s" + IDS_INCORRECTPASSWORDTITLE "ÐÑÐ¾Ð´ Ð½Ðµ Ð±ÑÐ» Ð¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÑÐ½" + IDS_INCORRECTPASSWORD "Ð£Ð±ÐµÐ´Ð¸ÑÐµÑÑ, ÑÑÐ¾ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ\nÐ¸ Ð¿Ð°ÑÐ¾Ð»Ñ Ð²ÐµÑÐ½Ñ." + IDS_CAPSLOCKONTITLE "Caps Lock Ð²ÐºÐ»ÑÑÐµÐ½" + IDS_CAPSLOCKON "ÐÐ°ÑÐ¾Ð»Ñ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð²Ð²ÐµÐ´ÑÐ½ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ Ð¸Ð·-Ð·Ð° Ð½Ð°Ð¶Ð°ÑÐ¾Ð¹ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ Caps Lock.\n\nÐÑÐºÐ»ÑÑÐ¸ÑÐµ Caps Lock Ð¿ÐµÑÐµÐ´ ÑÐµÐ¼, ÐºÐ°Ðº Ð²Ð²Ð¾Ð´Ð¸ÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ." } Modified: trunk/reactos/dll/win32/credui/credui_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Si… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Si.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/credui/credui_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Sv… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Sv.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/credui/credui_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Zh… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Zh.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -82,5 +84,3 @@ IDS_CAPSLOCKONTITLE "å¤§å¯«éå®éè" IDS_CAPSLOCKON "éèå¤§å¯«éå®å¯è½å°è´ä½ è¼¸å¥é¯èª¤çå¯ç¢¼." } - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/credui/credui_resources.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_re… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_resources.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_resources.h [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> + #define IDD_CREDDIALOG 100 #define IDC_USERNAME 101 #define IDC_PASSWORD 102

1 0

[janderwald] 42797: - Add types for bda driver
by janderwald＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: janderwald Date: Thu Aug 20 13:39:54 2009 New Revision: 42797 URL: http://svn.reactos.org/svn/reactos?rev=42797&view=rev Log: - Add types for bda driver Modified: trunk/reactos/include/dxsdk/bdamedia.h trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/dxsdk/bdamedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/bdamedia.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] Thu Aug 20 13:39:54 2009 @@ -14,4 +14,165 @@ ULONG ulOutputPinId; } KSP_BDA_NODE_PIN, *PKSP_BDA_NODE_PIN; +typedef struct _KSM_BDA_PIN +{ + KSMETHOD Method; + union + { + ULONG PinId; + ULONG PinType; + }; + ULONG Reserved; +} KSM_BDA_PIN, * PKSM_BDA_PIN; + +typedef struct _KSM_BDA_PIN_PAIR +{ + KSMETHOD Method; + union + { + ULONG InputPinId; + ULONG InputPinType; + }; + union + { + ULONG OutputPinId; + ULONG OutputPinType; + }; +} KSM_BDA_PIN_PAIR, * PKSM_BDA_PIN_PAIR; + +/* ------------------------------------------------------------ + BDA Topology Property Set {A14EE835-0A23-11d3-9CC7-00C04F7971E0} +*/ + +#define STATIC_KSPROPSETID_BdaTopology \ + 0xa14ee835, 0x0a23, 0x11d3, 0x9c, 0xc7, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 +DEFINE_GUIDSTRUCT("A14EE835-0A23-11d3-9CC7-00C04F7971E0", KSPROPSETID_BdaTopology); +#define KSPROPSETID_BdaTopology DEFINE_GUIDNAMED(KSPROPSETID_BdaTopology) + +typedef enum { + KSPROPERTY_BDA_NODE_TYPES, + KSPROPERTY_BDA_PIN_TYPES, + KSPROPERTY_BDA_TEMPLATE_CONNECTIONS, + KSPROPERTY_BDA_NODE_METHODS, + KSPROPERTY_BDA_NODE_PROPERTIES, + KSPROPERTY_BDA_NODE_EVENTS, + KSPROPERTY_BDA_CONTROLLING_PIN_ID, + KSPROPERTY_BDA_NODE_DESCRIPTORS + }KSPROPERTY_BDA_TOPOLOGY; + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_TYPES(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_NODE_TYPES,\ + (GetHandler),\ + sizeof(KSPROPERTY),\ + 0,\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_PIN_TYPES(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_PIN_TYPES,\ + (GetHandler),\ + sizeof(KSPROPERTY),\ + 0,\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_TEMPLATE_CONNECTIONS(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_TEMPLATE_CONNECTIONS,\ + (GetHandler),\ + sizeof(KSPROPERTY),\ + sizeof( BDA_TEMPLATE_CONNECTION),\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_METHODS(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_NODE_METHODS,\ + (GetHandler),\ + sizeof(KSP_NODE),\ + 0,\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_PROPERTIES(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_NODE_PROPERTIES,\ + (GetHandler),\ + sizeof(KSP_NODE),\ + 0,\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_EVENTS(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_NODE_EVENTS,\ + (GetHandler),\ + sizeof(KSP_NODE),\ + 0,\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_CONTROLLING_PIN_ID(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_CONTROLLING_PIN_ID,\ + (GetHandler),\ + sizeof(KSP_BDA_NODE_PIN),\ + sizeof( ULONG),\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_DESCRIPTORS(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_NODE_DESCRIPTORS,\ + (GetHandler),\ + sizeof(KSPROPERTY),\ + 0,\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + +/* ------------------------------------------------------------ + BDA Device Configuration Method Set {71985F45-1CA1-11d3-9CC8-00C04F7971E0} +*/ + +#define STATIC_KSMETHODSETID_BdaDeviceConfiguration \ + 0x71985f45, 0x1ca1, 0x11d3, 0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 +DEFINE_GUIDSTRUCT("71985F45-1CA1-11d3-9CC8-00C04F7971E0", KSMETHODSETID_BdaDeviceConfiguration); +#define KSMETHODSETID_BdaDeviceConfiguration DEFINE_GUIDNAMED(KSMETHODSETID_BdaDeviceConfiguration) + +typedef enum { + KSMETHOD_BDA_CREATE_PIN_FACTORY = 0, + KSMETHOD_BDA_DELETE_PIN_FACTORY, + KSMETHOD_BDA_CREATE_TOPOLOGY +} KSMETHOD_BDA_DEVICE_CONFIGURATION; + +#define DEFINE_KSMETHOD_ITEM_BDA_CREATE_PIN_FACTORY(MethodHandler, SupportHandler)\ + DEFINE_KSMETHOD_ITEM(\ + KSMETHOD_BDA_CREATE_PIN_FACTORY,\ + KSMETHOD_TYPE_READ,\ + (MethodHandler),\ + sizeof(KSM_BDA_PIN),\ + sizeof(ULONG),\ + SupportHandler) + +#define DEFINE_KSMETHOD_ITEM_BDA_DELETE_PIN_FACTORY(MethodHandler, SupportHandler)\ + DEFINE_KSMETHOD_ITEM(\ + KSMETHOD_BDA_DELETE_PIN_FACTORY,\ + KSMETHOD_TYPE_NONE,\ + (MethodHandler),\ + sizeof(KSM_BDA_PIN),\ + 0,\ + SupportHandler) + +#define DEFINE_KSMETHOD_ITEM_BDA_CREATE_TOPOLOGY(MethodHandler, SupportHandler)\ + DEFINE_KSMETHOD_ITEM(\ + KSMETHOD_BDA_CREATE_TOPOLOGY,\ + KSMETHOD_TYPE_WRITE,\ + (MethodHandler),\ + sizeof(KSM_BDA_PIN_PAIR),\ + 0,\ + SupportHandler) + + #endif Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4279… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Thu Aug 20 13:39:54 2009 @@ -1808,6 +1808,30 @@ ULONG Flags; } KSMETHOD_ITEM, *PKSMETHOD_ITEM; +#ifndef _MSC_VER + +#define DEFINE_KSMETHOD_ITEM(MethodId, Flags,\ + MethodHandler,\ + MinMethod, MinData, SupportHandler)\ +{\ + MethodId, {(PFNKSHANDLER)MethodHandler}, MinMethod, MinData,\ + SupportHandler, Flags\ +} + +#else + +#define DEFINE_KSMETHOD_ITEM(MethodId, Flags,\ + MethodHandler,\ + MinMethod, MinData, SupportHandler)\ +{\ + MethodId, (PFNKSHANDLER)MethodHandler, MinMethod, MinData,\ + SupportHandler, Flags\ +} + + + +#endif + typedef struct { @@ -1818,6 +1842,12 @@ }; } KSFASTMETHOD_ITEM, *PKSFASTMETHOD_ITEM; +#define DEFINE_KSFASTMETHOD_ITEM(MethodId, MethodHandler)\ +{\ + MethodId, (PFNKSFASTHANDLER)MethodHandler\ +} + + typedef struct { const GUID* Set; @@ -1826,6 +1856,20 @@ ULONG FastIoCount; const KSFASTMETHOD_ITEM*FastIoTable; } KSMETHOD_SET, *PKSMETHOD_SET; + + +#define DEFINE_KSMETHOD_SET(Set,\ + MethodsCount,\ + MethodItem,\ + FastIoCount,\ + FastIoTable)\ +{\ + Set,\ + MethodsCount,\ + MethodItem,\ + FastIoCount,\ + FastIoTable\ +} #endif /* ===============================================================

1 0

[cwittich] 42796: sync oledlg with wine 1.1.27
by cwittich＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: cwittich Date: Thu Aug 20 12:36:10 2009 New Revision: 42796 URL: http://svn.reactos.org/svn/reactos?rev=42796&view=rev Log: sync oledlg with wine 1.1.27 Added: trunk/reactos/dll/win32/oledlg/oledlg_Lt.rc (with props) Modified: trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc trunk/reactos/dll/win32/oledlg/oledlg_Da.rc trunk/reactos/dll/win32/oledlg/oledlg_De.rc trunk/reactos/dll/win32/oledlg/oledlg_En.rc trunk/reactos/dll/win32/oledlg/oledlg_Es.rc trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc trunk/reactos/dll/win32/oledlg/oledlg_It.rc trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc trunk/reactos/dll/win32/oledlg/oledlg_No.rc trunk/reactos/dll/win32/oledlg/oledlg_Pl.rc trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc trunk/reactos/dll/win32/oledlg/oledlg_Si.rc trunk/reactos/dll/win32/oledlg/oledlg_Sv.rc trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc trunk/reactos/dll/win32/oledlg/oledlg_Zh.rc trunk/reactos/dll/win32/oledlg/resource.h trunk/reactos/dll/win32/oledlg/rsrc.rc Modified: trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Cs… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -18,6 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "resource.h" LANGUAGE LANG_CZECH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/oledlg_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Da… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Da.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "resource.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/oledlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_De… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_De.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -16,11 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Objekt einfügen" +CAPTION "Objekt einfÃ¼gen" FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | @@ -37,7 +41,7 @@ CONTROL "A&us Datei erstellen",IDC_CREATEFROMFILE,"Button", BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON "Steuerung hin&zufügen",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + PUSHBUTTON "Steuerung hin&zufÃ¼gen",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE CONTROL "Als &Symbol anzeigen",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "D&urchsuchen...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE @@ -47,22 +51,22 @@ STRINGTABLE DISCARDABLE { - IDS_RESULTOBJDESC "Fügt ein neues %s - Objekt in Ihr Dokument ein." - IDS_RESULTFILEOBJDESC "Fügt den Inhalt der Datei als Objekt so in Ihr Dokument ein, dass Sie es mit dem Programm aktivieren können, mit dem es erstellt wurde." + IDS_RESULTOBJDESC "FÃ¼gt ein neues %s - Objekt in Ihr Dokument ein." + IDS_RESULTFILEOBJDESC "FÃ¼gt den Inhalt der Datei als Objekt so in Ihr Dokument ein, dass Sie es mit dem Programm aktivieren kÃ¶nnen, mit dem es erstellt wurde." IDS_BROWSE "Durchsuchen" - IDS_NOTOLEMOD "Die Datei ist offenbar kein gültiges OLE - Steuermodul. Die OLE - Steuerung konnte nicht registiert werden." - IDS_NOTOLEMODCAPTION "Steuerung hinzufügen" + IDS_NOTOLEMOD "Die Datei ist offenbar kein gÃ¼ltiges OLE - Steuermodul. Die OLE - Steuerung konnte nicht registiert werden." + IDS_NOTOLEMODCAPTION "Steuerung hinzufÃ¼gen" } IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Inhalte einfügen" +CAPTION "Inhalte einfÃ¼gen" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Quelle:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP - CONTROL "&Einfügen", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + CONTROL "&EinfÃ¼gen", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 6, 38, 55, 10 - CONTROL "&Verknüpfung einfügen", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + CONTROL "&VerknÃ¼pfung einfÃ¼gen", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, 6, 63, 55, 10 LTEXT "&Als:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE @@ -73,7 +77,7 @@ CONTROL "&Hilfe", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 CONTROL "Als Symbol &darstellen", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 - CONTROL "&Symbol ändern...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "&Symbol Ã¤ndern...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 CONTROL "<< result text goes here >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 CONTROL "Ergebnis", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 @@ -82,14 +86,15 @@ STRINGTABLE DISCARDABLE { - IDS_PS_PASTE_DATA "Fügt den Inhalt der Zwischenablage in Ihr Dokument als %s ein." - IDS_PS_PASTE_OBJECT "Fügt den Inhalt der Zwischenablage so in Ihr Dokument ein dass Sie es mit %s aktivieren können." - IDS_PS_PASTE_OBJECT_AS_ICON "Fügt den Inhalt der Zwischenablage so in Ihr Dokument ein dass Sie es mit %s aktivieren können. Wird als Symbol dargestellt." - IDS_PS_PASTE_LINK_DATA "Fügt den Inhalt der Zwischenablage in Ihr Dokument als %s ein. Die Daten sind mit der Ursprungsdatei verknüpft so dass Änderungen an dieser in Ihrem Dokument erscheinen." - IDS_PS_PASTE_LINK_OBJECT "Fügt ein Bild des Zwischenablagen-Inhalts in Ihr Dokument ein. Das Bild ist mit der Ursprungsdatei verknüpft so dass Änderungen an dieser in Ihrem Dokument erscheinen." - IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Fügt eine Verknüpfung ein die auf den Ort des Zwischenablagen-Inhalts zeigt. Die Verknüpfung ist mit der Ursprungsdatei verknüpft so dass Änderungen an dieser in Ihrem Dokument erscheinen." - IDS_PS_NON_OLE "Fügt den Inhalt der Zwischenablage in Ihr Dokument als ein." + IDS_PS_PASTE_DATA "FÃ¼gt den Inhalt der Zwischenablage in Ihr Dokument als %s ein." + IDS_PS_PASTE_OBJECT "FÃ¼gt den Inhalt der Zwischenablage so in Ihr Dokument ein dass Sie es mit %s aktivieren kÃ¶nnen." + IDS_PS_PASTE_OBJECT_AS_ICON "FÃ¼gt den Inhalt der Zwischenablage so in Ihr Dokument ein dass Sie es mit %s aktivieren kÃ¶nnen. Wird als Symbol dargestellt." + IDS_PS_PASTE_LINK_DATA "FÃ¼gt den Inhalt der Zwischenablage in Ihr Dokument als %s ein. Die Daten sind mit der Ursprungsdatei verknÃ¼pft so dass Ãnderungen an dieser in Ihrem Dokument erscheinen." + IDS_PS_PASTE_LINK_OBJECT "FÃ¼gt ein Bild des Zwischenablagen-Inhalts in Ihr Dokument ein. Das Bild ist mit der Ursprungsdatei verknÃ¼pft so dass Ãnderungen an dieser in Ihrem Dokument erscheinen." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "FÃ¼gt eine VerknÃ¼pfung ein die auf den Ort des Zwischenablagen-Inhalts zeigt. Die VerknÃ¼pfung ist mit der Ursprungsdatei verknÃ¼pft so dass Ãnderungen an dieser in Ihrem Dokument erscheinen." + IDS_PS_NON_OLE "FÃ¼gt den Inhalt der Zwischenablage in Ihr Dokument als ein." IDS_PS_UNKNOWN_TYPE "Unbekannter Typ" IDS_PS_UNKNOWN_SRC "Unbekannte Quelle" IDS_PS_UNKNOWN_APP "dem Erzeugerprogramm" } +#pragma code_page(default) Modified: trunk/reactos/dll/win32/oledlg/oledlg_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_En… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_En.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "resource.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/oledlg_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Es… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Es.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "resource.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Fr… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -3,6 +3,7 @@ * French language support * * Copyright (C) 2005-2006 Jonathan Ernst + * Copyright (C) 2009 FrÃ©dÃ©ric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,48 +20,52 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 308, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Insérer Objet" +CAPTION "InsÃ©rer objet" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LISTBOX IDC_OBJTYPELIST,94,19,131,66,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "Type d'objet :",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE - DEFPUSHBUTTON "OK",IDOK,221,7,66,14 - PUSHBUTTON "Annuler",IDCANCEL,221,24,66,14 - GROUPBOX "Résultat",IDC_RESULT,7,103,208,41 - CONTROL "Créer nouveau",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + LTEXT "Type d'objet :",IDC_OBJTYPELBL,94,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "OK",IDOK,233,7,65,14 + PUSHBUTTON "Annuler",IDCANCEL,233,24,65,14 + GROUPBOX "RÃ©sultat",IDC_RESULT,7,103,218,41 + CONTROL "CrÃ©er nouveau",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 - CONTROL "Créer le contrôle",IDC_CREATECONTROL,"Button", - BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 - CONTROL "Créer depuis le fichier",IDC_CREATEFROMFILE,"Button", - BS_AUTORADIOBUTTON,7,37,67,10 - LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON "&Ajoute Contrôle...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Afficher comme icône",IDC_ASICON,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 - PUSHBUTTON "Parcourir...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE - LTEXT "Fichier :",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE - EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE + CONTROL "CrÃ©er un contrÃ´le",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,72,10 + CONTROL "CrÃ©er depuis le fichier",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,82,10 + LTEXT "",IDC_RESULTDESC,47,112,173,25 + PUSHBUTTON "&Ajouter un contrÃ´le...",IDC_ADDCONTROL,94,88,80,14,NOT WS_VISIBLE + CONTROL "Afficher comme une icÃ´ne",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + BS_MULTILINE | WS_TABSTOP | NOT WS_VISIBLE,234,51,61,35 + PUSHBUTTON "Parcourir...",IDC_BROWSE,96,53,50,14,NOT WS_VISIBLE + LTEXT "Fichier :",IDC_FILELBL,96,27,27,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,95,37,129,13,ES_AUTOHSCROLL | NOT WS_VISIBLE END STRINGTABLE DISCARDABLE { - IDS_RESULTOBJDESC "Insérer un nouvel object %s dans votre document" - IDS_RESULTFILEOBJDESC "Insère le contenu du fichier comme un objet dans votre document afin que vous puissiez l'activer en utilisant le programme avec lequel il a été créé." + IDS_RESULTOBJDESC "InsÃ©rer un nouvel object %s dans votre document" + IDS_RESULTFILEOBJDESC "InsÃ¨re le contenu du fichier comme un objet dans votre document afin que vous puissiez l'activer en utilisant le programme avec lequel il a Ã©tÃ© crÃ©Ã©." IDS_BROWSE "Parcourir" - IDS_NOTOLEMOD "Le fichier ne semble pas être un module OLE valide. Impossible d'enregistrer le contrôle OLE." - IDS_NOTOLEMODCAPTION "Ajouter un contrôle" + IDS_NOTOLEMOD "Le fichier ne semble pas Ãªtre un module OLE valide. Impossible d'enregistrer le contrÃ´le OLE." + IDS_NOTOLEMODCAPTION "Ajouter un contrÃ´le" } -IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 308, 140 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Collage spécial" +CAPTION "Collage spÃ©cial" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Source :", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP @@ -68,32 +73,33 @@ 6, 38, 55, 10 CONTROL "Coller le &lien", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, 6, 63, 55, 10 - LTEXT "&Comme :", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LTEXT "&Comme :", -1, 65, 25, 31, 8, WS_VISIBLE | WS_GROUP LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE - CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 - CONTROL "Annuler", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 - CONTROL "Aid&e", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 - CONTROL "&Afficher comme icône", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 - CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 - CONTROL "Changer l'&icône...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 - CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 - CONTROL "<< le résultat vient ici >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 - CONTROL "Résultat", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 228, 6, 66, 14 + CONTROL "Annuler", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 228, 23, 66, 14 + CONTROL "Aid&e", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 228, 42, 66, 14 + CONTROL "&Afficher comme une icÃ´ne", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP | WS_VISIBLE, 228, 63, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 84, 21, 20 + CONTROL "Changer l'&icÃ´ne...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 12, 103, 21, 20 + CONTROL "<< le rÃ©sultat vient ici >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 53, 99, 161, 35 + CONTROL "RÃ©sultat", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 END STRINGTABLE DISCARDABLE { - IDS_PS_PASTE_DATA "Insère le contenu du presse-papiers dans votre document comme %s." - IDS_PS_PASTE_OBJECT "Insère le contenu du presse-papiers dans votre document de sorte que vous puissiez l'activer en utilisant %s." - IDS_PS_PASTE_OBJECT_AS_ICON "Insère le contenu du presse-papiers dans votre document de sorte que vous puissiez l'activer en utilisant %s. Il sera affiché comme une icône." - IDS_PS_PASTE_LINK_DATA "Insère le contenu du presse-papiers dans votre document comme %s. Les données sont liées au fichier source de sorte que les modifications de celles-ci seront répercutées dans votre document." - IDS_PS_PASTE_LINK_OBJECT "Insère le contenu du presse-papiers dans votre document. L'image est liée au fichier source de sorte que les modifications de celle-ci seront répercutées dans votre document." - IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Insère un raccourci qui pointe vers l'emplacement du contenu du presse-papiers. Le raccourci est lié au fichier source de sorte que les modifications de celui-ci seront répercutées dans votre document." - IDS_PS_NON_OLE "Insère le contenu du presse-papiers dans votre document." + IDS_PS_PASTE_DATA "InsÃ¨re le contenu du presse-papiers dans votre document comme %s." + IDS_PS_PASTE_OBJECT "InsÃ¨re le contenu du presse-papiers dans votre document de sorte que vous puissiez l'activer en utilisant %s." + IDS_PS_PASTE_OBJECT_AS_ICON "InsÃ¨re le contenu du presse-papiers dans votre document de sorte que vous puissiez l'activer en utilisant %s. Il sera affichÃ© comme une icÃ´ne." + IDS_PS_PASTE_LINK_DATA "InsÃ¨re le contenu du presse-papiers dans votre document comme %s. Les donnÃ©es sont liÃ©es au fichier source de sorte que les modifications de celles-ci seront rÃ©percutÃ©es dans votre document." + IDS_PS_PASTE_LINK_OBJECT "InsÃ¨re une image du contenu du presse-papiers dans votre document. L'image est liÃ©e au fichier source de sorte que les modifications de celui-ci seront rÃ©percutÃ©es dans votre document." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "InsÃ¨re un raccourci qui pointe vers l'emplacement du contenu du presse-papiers. Le raccourci est liÃ© au fichier source de sorte que les modifications de celui-ci seront rÃ©percutÃ©es dans votre document." + IDS_PS_NON_OLE "InsÃ¨re le contenu du presse-papiers dans votre document." IDS_PS_UNKNOWN_TYPE "Type inconnu" IDS_PS_UNKNOWN_SRC "Source inconnue" - IDS_PS_UNKNOWN_APP "le programme avec lequel il a été créé" + IDS_PS_UNKNOWN_APP "le programme avec lequel il a Ã©tÃ© crÃ©Ã©" } +#pragma code_page(default) Modified: trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Hu… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "resource.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/oledlg_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_It… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_It.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -16,6 +16,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "resource.h" LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Ja… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "resource.h" /* UTF-8 */ #pragma code_page(65001) @@ -56,5 +58,4 @@ IDS_NOTOLEMOD "ãã¡ã¤ã«ã¯æå¹ãªOLEã¢ã¸ã¥ã¼ã«ã§ã¯ãªãããã§ããOLEã³ã³ããã¼ã«ãç»é²ã§ãã¾ããã" IDS_NOTOLEMODCAPTION "ã³ã³ããã¼ã«ãè¿½å " } - #pragma code_page(default) Modified: trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Ko… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "resource.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Added: trunk/reactos/dll/win32/oledlg/oledlg_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Lt… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Lt.rc (added) +++ trunk/reactos/dll/win32/oledlg/oledlg_Lt.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -1,0 +1,101 @@ +/* + * Copyright 2009 Aurimas FiÅ¡eras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ä®terpti objektÄ" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Objekto tipas:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "Gerai",IDOK,221,7,66,14 + PUSHBUTTON "Atsisakyti",IDCANCEL,221,24,66,14 + GROUPBOX "Rezultatas",IDC_RESULT,7,103,208,41 + CONTROL "Sukurti naujÄ",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "Sukurti valdiklÄ¯",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "Sukurti iÅ¡ failo",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "&PridÄti valdiklÄ¯...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "Rodyti kaip piktogramÄ",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + BS_MULTILINE | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,20 + PUSHBUTTON "Parinkti...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "Failas:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "Ä®terpia naujÄ objektÄ â%sâ Ä¯ jÅ«sÅ³ dokumentÄ" + IDS_RESULTFILEOBJDESC "Ä®terpia failo turinÄ¯ kaip objektÄ Ä¯ jÅ«sÅ³ dokumentÄ, kad galÄtumÄte jÄ¯ aktyvuoti naudodami programÄ, kuri jÄ¯ sukÅ«rÄ." + IDS_BROWSE "Parinkti" + IDS_NOTOLEMOD "PanaÅ¡u, kad failas nÄra galiojantis OLE modulis. Nepavyko uÅ¾registruoti OLE valdiklio." + IDS_NOTOLEMODCAPTION "PridÄti valdiklÄ¯" +} + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ä®dÄti kaip" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Å altinis:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "Ä®&dÄti", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "Ä®dÄti &saitÄ", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&Kaip:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "Gerai", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "Atsisakyti", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "&Å½inynas", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "&Rodyti kaip piktogramÄ", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 20 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 81, 66, 44 + CONTROL "Keisti &piktogramÄ...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< Äia pateikiamas rezultato tekstas >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "Rezultatas", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "Ä®terpia iÅ¡karpinÄs turinÄ¯ Ä¯ jÅ«sÅ³ dokumentÄ kaip %s." + IDS_PS_PASTE_OBJECT "Ä®terpia iÅ¡karpinÄs turinÄ¯ Ä¯ jÅ«sÅ³ dokumentÄ, kad galÄtumÄte jÄ¯ aktyvuoti naudodami %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Ä®terpia iÅ¡karpinÄs turinÄ¯ Ä¯ jÅ«sÅ³ dokumentÄ, kad galÄtumÄte jÄ¯ aktyvuoti naudodami %s. Jis bus rodomas kaip piktograma." + IDS_PS_PASTE_LINK_DATA "Ä®terpia iÅ¡karpinÄs turinÄ¯ Ä¯ jÅ«sÅ³ dokumentÄ kaip %s. Duomenys yra susieti su Å¡altinio failu, todÄl failo pakeitimai bus atspindÄti jÅ«sÅ³ dokumente." + IDS_PS_PASTE_LINK_OBJECT "Ä®terpia iÅ¡karpinÄs turinio paveikslÄ Ä¯ jÅ«sÅ³ dokumentÄ. Paveikslas yra susietas su Å¡altinio failu, todÄl failo pakeitimai bus atspindÄti jÅ«sÅ³ dokumente." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Ä®terpia nuorodÄ, kuri rodo Ä¯ iÅ¡karpinÄs turinÄ¯. Nuoroda yra susieta su Å¡altinio failu, todÄl failo pakeitimai bus atspindÄti jÅ«sÅ³ dokumente." + IDS_PS_NON_OLE "Ä®terpia iÅ¡karpinÄs turinÄ¯ Ä¯ jÅ«sÅ³ dokumentÄ." + IDS_PS_UNKNOWN_TYPE "NeÅ¾inomas tipas" + IDS_PS_UNKNOWN_SRC "NeÅ¾inomas Å¡altinis" + IDS_PS_UNKNOWN_APP "programa, kuri jÄ¯ sukÅ«rÄ" +} +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/oledlg/oledlg_Lt.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Nl… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "resource.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/oledlg/oledlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_No… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_No.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "resource.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/oledlg/oledlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Pl… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Pl.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -16,6 +16,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "resource.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Pt… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -1,6 +1,7 @@ /* * Copyright 2004 Marcelo Duarte - * Copyright 2006 Américo José Melo + * Copyright 2006 AmÃ©rico JosÃ© Melo + * Copyright 2009 Ricardo Filipe * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,6 +17,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "resource.h" + +#pragma code_page(65001) LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN @@ -39,7 +44,7 @@ BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "&Adicionar Controle...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Mostrar como ícone",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "Mostrar como Ãcone",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "Procurar...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE LTEXT "Arquivo:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE @@ -68,7 +73,7 @@ BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "&Adicionar Controlo...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Mostrar como ícone",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "Mostrar como Ãcone",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "Procurar...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE LTEXT "Ficheiro:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE @@ -81,9 +86,9 @@ STRINGTABLE DISCARDABLE { IDS_RESULTOBJDESC "Inserir um novo objeto %s no documento" - IDS_RESULTFILEOBJDESC "Inserir o conteúdo do arquivo como um objeto no documento de modo que possa ativá-lo usando o programa que o criou." + IDS_RESULTFILEOBJDESC "Inserir o conteÃºdo do arquivo como um objeto no documento de modo que possa ativÃ¡-lo usando o programa que o criou." IDS_BROWSE "Procurar" - IDS_NOTOLEMOD "O arquivo não parece ser um módulo OLE válido. Impossível registrar o controle OLE." + IDS_NOTOLEMOD "O arquivo nÃ£o parece ser um mÃ³dulo OLE vÃ¡lido. ImpossÃvel registrar o controle OLE." IDS_NOTOLEMODCAPTION "Adicionar Controle" } @@ -92,8 +97,48 @@ STRINGTABLE DISCARDABLE { IDS_RESULTOBJDESC "Inserir novo objecto %s no documento" - IDS_RESULTFILEOBJDESC "Inserir conteúdo do ficheiro como um objecto no documento de modo que opossa activar usando o programa que o criou." + IDS_RESULTFILEOBJDESC "Inserir conteÃºdo do ficheiro como um objecto no documento de modo que opossa activar usando o programa que o criou." IDS_BROWSE "Procurar" - IDS_NOTOLEMOD "O ficheiro não parece ser um módulo OLE válido. Impossível registrar o controlo OLE." + IDS_NOTOLEMOD "O ficheiro nÃ£o parece ser um mÃ³dulo OLE vÃ¡lido. ImpossÃvel registrar o controlo OLE." IDS_NOTOLEMODCAPTION "Adicionar Controlo" } + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Colar Especial" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Origem:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "&Colar", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "Colar &LigaÃ§Ã£o", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&Como:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "Cancelar", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "&Ajuda", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "&Mostrar como Icone", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 + CONTROL "Mudar &Icone...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< texto resultante fica aqui >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "Resultado", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "Insere o conteÃºdo da Ã¡rea de transferÃªncia no seu documento como %s." + IDS_PS_PASTE_OBJECT "Insere o conteÃºdo da Ã¡rea de transferÃªncia no seu documento para que o possa activar usando %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Insere o conteÃºdo da Ã¡rea de transferÃªncia no seu documento para que o possa activar usando %s. Vai ser mostrado como um icone." + IDS_PS_PASTE_LINK_DATA "Insere o conteÃºdo da Ã¡rea de transferÃªncia no seu documento como %s. Os dados estÃ£o ligados ao ficheiro de origem para que alteraÃ§Ãµes ao ficheiro se reflictam no seu documento." + IDS_PS_PASTE_LINK_OBJECT "Insere uma imagem da Ã¡rea de transferÃªncia no seu documento. A imagem fica ligada ao ficheiro de origem para que alteraÃ§Ãµes ao ficheiro se reflictam no seu documento." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Insere um atalho que aponta para a localizaÃ§Ã£o do conteÃºdo na Ã¡rea de transferÃªncia. O atalho fica ligado ao ficheiro de origem para que alteraÃ§Ãµes ao ficheiro se reflictam no seu documento." + IDS_PS_NON_OLE "Insere o conteÃºdo da Ã¡rea de transferÃªncia no seu documento." + IDS_PS_UNKNOWN_TYPE "Tipo Desconhecido" + IDS_PS_UNKNOWN_SRC "Origem Desconhecida" + IDS_PS_UNKNOWN_APP "o programa que o criou" +} Modified: trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Ru… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -16,80 +16,85 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Âñòàâèòü îáúåêò" +CAPTION "ÐÑÑÐ°Ð²Ð¸ÑÑ Ð¾Ð±ÑÐµÐºÑ" FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "Òèï îáúåêòà:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + LTEXT "Ð¢Ð¸Ð¿ Ð¾Ð±ÑÐµÐºÑÐ°:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE DEFPUSHBUTTON "OK",IDOK,221,7,66,14 - PUSHBUTTON "Îòìåíà",IDCANCEL,221,24,66,14 - GROUPBOX "Ðåçóëüòàò",IDC_RESULT,7,103,208,41 - CONTROL "Ñîçäàòü íîâûé",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL,221,24,66,14 + GROUPBOX "Ð ÐµÐ·ÑÐ»ÑÑÐ°Ñ",IDC_RESULT,7,103,208,41 + CONTROL "Ð¡Ð¾Ð·Ð´Ð°ÑÑ Ð½Ð¾Ð²ÑÐ¹",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 - CONTROL "Ñîçäàòü ýëåìåíò óïðàâëåíèÿ",IDC_CREATECONTROL,"Button", + CONTROL "Ð¡Ð¾Ð·Ð´Ð°ÑÑ ÑÐ»ÐµÐ¼ÐµÐ½Ñ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 - CONTROL "Ñîçäàòü èç ôàéëà",IDC_CREATEFROMFILE,"Button", + CONTROL "Ð¡Ð¾Ð·Ð´Ð°ÑÑ Ð¸Ð· ÑÐ°Ð¹Ð»Ð°",IDC_CREATEFROMFILE,"Button", BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON "&Äîáàâèòü ýëåìåíò óïðàâëåíèÿ...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + PUSHBUTTON "&ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÑÐ»ÐµÐ¼ÐµÐ½Ñ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE CONTROL "Display As Icon",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 - PUSHBUTTON "Âûáðàòü...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE - LTEXT "Ôàéë:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + PUSHBUTTON "ÐÑÐ±ÑÐ°ÑÑ...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "Ð¤Ð°Ð¹Ð»:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE END STRINGTABLE DISCARDABLE { - IDS_RESULTOBJDESC "Äîáàâëåíèå íîâîãî îáúåêòà %s â äîêóìåíò" - IDS_RESULTFILEOBJDESC "Äîáàâëåíèå îáúåêòà èç ôàéëà â äîêóìåíò. Ðàáîòàòü ñ îáúåêòîì ìîæíî áóäåò â ñîçäàâøåé åãî ïðîãðàììå." - IDS_BROWSE "Ïðîñìîòð" - IDS_NOTOLEMOD "Ôàéë íå ÿâëÿåòñÿ êîððåêòíûì ìîäóëåì OLE. Íåâîçìîæíî çàðåãèñòðèðîâàòü ýëåìåíò óïðàâëåíèÿ OLE." - IDS_NOTOLEMODCAPTION "Äîáàâèòü ýëåìåíò óïðàâëåíèÿ" + IDS_RESULTOBJDESC "ÐÐ¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¾Ð±ÑÐµÐºÑÐ° %s Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ" + IDS_RESULTFILEOBJDESC "ÐÐ¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¾Ð±ÑÐµÐºÑÐ° Ð¸Ð· ÑÐ°Ð¹Ð»Ð° Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ. Ð Ð°Ð±Ð¾ÑÐ°ÑÑ Ñ Ð¾Ð±ÑÐµÐºÑÐ¾Ð¼ Ð¼Ð¾Ð¶Ð½Ð¾ Ð±ÑÐ´ÐµÑ Ð² ÑÐ¾Ð·Ð´Ð°Ð²ÑÐµÐ¹ ÐµÐ³Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ." + IDS_BROWSE "ÐÑÐ¾ÑÐ¼Ð¾ÑÑ" + IDS_NOTOLEMOD "Ð¤Ð°Ð¹Ð» Ð½Ðµ ÑÐ²Ð»ÑÐµÑÑÑ ÐºÐ¾ÑÑÐµÐºÑÐ½ÑÐ¼ Ð¼Ð¾Ð´ÑÐ»ÐµÐ¼ OLE. ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÐ»ÐµÐ¼ÐµÐ½Ñ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ OLE." + IDS_NOTOLEMODCAPTION "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÑÐ»ÐµÐ¼ÐµÐ½Ñ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ" } IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ñïåöèàëüíàÿ âñòàâêà" +CAPTION "Ð¡Ð¿ÐµÑÐ¸Ð°Ð»ÑÐ½Ð°Ñ Ð²ÑÑÐ°Ð²ÐºÐ°" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Èñòî÷íèê:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP - CONTROL "&Âñòàâèòü", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + LTEXT "ÐÑÑÐ¾ÑÐ½Ð¸Ðº:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "&ÐÑÑÐ°Ð²Ð¸ÑÑ", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 6, 38, 55, 10 - CONTROL "Âñòàâèòü &Ññûëêó", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + CONTROL "ÐÑÑÐ°Ð²Ð¸ÑÑ &Ð¡ÑÑÐ»ÐºÑ", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, 6, 63, 55, 10 - LTEXT "&Êàê:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LTEXT "&ÐÐ°Ðº:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 - CONTROL "Îòìåíà", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 - CONTROL "Ñ&ïðàâêà", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 - CONTROL "&Ïîêàçûâàòü êàê çíà÷îê", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "Ð¡&Ð¿ÑÐ°Ð²ÐºÐ°", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "&ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ ÐºÐ°Ðº Ð·Ð½Ð°ÑÐ¾Ðº", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 - CONTROL "Èçìåíèòü &çíà÷îê...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ &Ð·Ð½Ð°ÑÐ¾Ðº...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 CONTROL "<< result text goes here >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 - CONTROL "Ðåçóëüòàò", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "Ð ÐµÐ·ÑÐ»ÑÑÐ°Ñ", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 END STRINGTABLE DISCARDABLE { - IDS_PS_PASTE_DATA "Âñòàâêà ñîäåðæèìîãî áóôåðà îáìåíà â äîêóìåíò êàê %s." - IDS_PS_PASTE_OBJECT "Âñòàâêà ñîäåðæèìîãî áóôåðà îáìåíà â äîêóìåíò òàê, ÷òî åãî ìîæíî àêòèâèðîâàòü, èñïîëüçóÿ %s." - IDS_PS_PASTE_OBJECT_AS_ICON "Âñòàâêà ñîäåðæèìîãî áóôåðà îáìåíà â äîêóìåíò òàê, ÷òî åãî ìîæíî àêòèâèðîâàòü, èñïîëüçóÿ %s. Îí áóäåò îòîáðàæàòüñÿ â âèäå çíà÷êà." - IDS_PS_PASTE_LINK_DATA "Âñòàâêà ñîäåðæèìîãî áóôåðà îáìåíà â äîêóìåíò êàê %s. Äàííûå áóäóò ñâÿçàíû ñ èñõîäíûì ôàéëîì, òàê ÷òî èçìåíåíèÿ â í¸ì áóäóò îòðàæàòüñÿ â äîêóìåíòå." - IDS_PS_PASTE_LINK_OBJECT "Âñòàâêà èçîáðàæåíèÿ èç áóôåðà îáìåíà â äîêóìåíò. Èçáðàæåíèå áóäåò ñâÿçàíî ñ èñõîäíûì ôàéëîì, òàê ÷òî èçìåíåíèÿ â í¸ì áóäóò îòðàæàòüñÿ â äîêóìåíòå." - IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Âñòàâêà ññûëêè, êîòîðàÿ áóäåò óêàçûâàòü íà ðàñïîëîæåíèå ñîäåðæèìîãî áóôåðà îáìåíà. Ññûëêà áóäåò ñâÿçàíà ñ èñõîäíûì ôàéëîì, òàê ÷òî èçìåíåíèÿ â í¸ì áóäóò îòðàæàòüñÿ â äîêóìåíòå." - IDS_PS_NON_OLE "Âñòàâêà ñîäåðæèìîå áóôåðà îáìåíà â äîêóìåíò." - IDS_PS_UNKNOWN_TYPE "Íåèçâåñòíûé òèï" - IDS_PS_UNKNOWN_SRC "Íåèçâåñòíûé èñòî÷íèê" - IDS_PS_UNKNOWN_APP "ïðîãðàììà, êîòîðàÿ åãî ñîçäàëà" + IDS_PS_PASTE_DATA "ÐÑÑÐ°Ð²ÐºÐ° ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ Ð±ÑÑÐµÑÐ° Ð¾Ð±Ð¼ÐµÐ½Ð° Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ ÐºÐ°Ðº %s." + IDS_PS_PASTE_OBJECT "ÐÑÑÐ°Ð²ÐºÐ° ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ Ð±ÑÑÐµÑÐ° Ð¾Ð±Ð¼ÐµÐ½Ð° Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ ÑÐ°Ðº, ÑÑÐ¾ ÐµÐ³Ð¾ Ð¼Ð¾Ð¶Ð½Ð¾ Ð°ÐºÑÐ¸Ð²Ð¸ÑÐ¾Ð²Ð°ÑÑ, Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÑ %s." + IDS_PS_PASTE_OBJECT_AS_ICON "ÐÑÑÐ°Ð²ÐºÐ° ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ Ð±ÑÑÐµÑÐ° Ð¾Ð±Ð¼ÐµÐ½Ð° Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ ÑÐ°Ðº, ÑÑÐ¾ ÐµÐ³Ð¾ Ð¼Ð¾Ð¶Ð½Ð¾ Ð°ÐºÑÐ¸Ð²Ð¸ÑÐ¾Ð²Ð°ÑÑ, Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÑ %s. ÐÐ½ Ð±ÑÐ´ÐµÑ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑÑÑ Ð² Ð²Ð¸Ð´Ðµ Ð·Ð½Ð°ÑÐºÐ°." + IDS_PS_PASTE_LINK_DATA "ÐÑÑÐ°Ð²ÐºÐ° ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ Ð±ÑÑÐµÑÐ° Ð¾Ð±Ð¼ÐµÐ½Ð° Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ ÐºÐ°Ðº %s. ÐÐ°Ð½Ð½ÑÐµ Ð±ÑÐ´ÑÑ ÑÐ²ÑÐ·Ð°Ð½Ñ Ñ Ð¸ÑÑÐ¾Ð´Ð½ÑÐ¼ ÑÐ°Ð¹Ð»Ð¾Ð¼, ÑÐ°Ðº ÑÑÐ¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² Ð½ÑÐ¼ Ð±ÑÐ´ÑÑ Ð¾ÑÑÐ°Ð¶Ð°ÑÑÑÑ Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐµ." + IDS_PS_PASTE_LINK_OBJECT "ÐÑÑÐ°Ð²ÐºÐ° Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð¸Ð· Ð±ÑÑÐµÑÐ° Ð¾Ð±Ð¼ÐµÐ½Ð° Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ. ÐÐ·Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ Ð±ÑÐ´ÐµÑ ÑÐ²ÑÐ·Ð°Ð½Ð¾ Ñ Ð¸ÑÑÐ¾Ð´Ð½ÑÐ¼ ÑÐ°Ð¹Ð»Ð¾Ð¼, ÑÐ°Ðº ÑÑÐ¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² Ð½ÑÐ¼ Ð±ÑÐ´ÑÑ Ð¾ÑÑÐ°Ð¶Ð°ÑÑÑÑ Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐµ." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "ÐÑÑÐ°Ð²ÐºÐ° ÑÑÑÐ»ÐºÐ¸, ÐºÐ¾ÑÐ¾ÑÐ°Ñ Ð±ÑÐ´ÐµÑ ÑÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð½Ð° ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ Ð±ÑÑÐµÑÐ° Ð¾Ð±Ð¼ÐµÐ½Ð°. Ð¡ÑÑÐ»ÐºÐ° Ð±ÑÐ´ÐµÑ ÑÐ²ÑÐ·Ð°Ð½Ð° Ñ Ð¸ÑÑÐ¾Ð´Ð½ÑÐ¼ ÑÐ°Ð¹Ð»Ð¾Ð¼, ÑÐ°Ðº ÑÑÐ¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² Ð½ÑÐ¼ Ð±ÑÐ´ÑÑ Ð¾ÑÑÐ°Ð¶Ð°ÑÑÑÑ Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐµ." + IDS_PS_NON_OLE "ÐÑÑÐ°Ð²ÐºÐ° ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ Ð±ÑÑÐµÑÐ° Ð¾Ð±Ð¼ÐµÐ½Ð° Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ." + IDS_PS_UNKNOWN_TYPE "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½ÑÐ¹ ÑÐ¸Ð¿" + IDS_PS_UNKNOWN_SRC "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½ÑÐ¹ Ð¸ÑÑÐ¾ÑÐ½Ð¸Ðº" + IDS_PS_UNKNOWN_APP "Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð°, ÐºÐ¾ÑÐ¾ÑÐ°Ñ ÐµÐ³Ð¾ ÑÐ¾Ð·Ð´Ð°Ð»Ð°" } Modified: trunk/reactos/dll/win32/oledlg/oledlg_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Si… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Si.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "resource.h" #pragma code_page(65001) @@ -95,5 +97,4 @@ IDS_PS_UNKNOWN_SRC "Neznan vir" IDS_PS_UNKNOWN_APP "Neznan program" } - #pragma code_page(default) Modified: trunk/reactos/dll/win32/oledlg/oledlg_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Sv… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Sv.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "resource.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Tr… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "resource.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/oledlg_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Zh… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Zh.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "resource.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -176,5 +178,3 @@ IDS_PS_UNKNOWN_SRC "ä¸æä¾æº" IDS_PS_UNKNOWN_APP "ä¸ææç¨ç¨å¼" } - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/oledlg/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/resource.… ============================================================================== --- trunk/reactos/dll/win32/oledlg/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/resource.h [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include <oledlg.h> #define IDS_RESULTOBJDESC 101 #define IDS_RESULTFILEOBJDESC 102 Modified: trunk/reactos/dll/win32/oledlg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/oledlg/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/rsrc.rc [iso-8859-1] Thu Aug 20 12:36:10 2009 @@ -43,6 +43,7 @@ #include "oledlg_It.rc" #include "oledlg_Ja.rc" #include "oledlg_Ko.rc" +#include "oledlg_Lt.rc" #include "oledlg_Nl.rc" #include "oledlg_No.rc" #include "oledlg_Pl.rc"

1 0

[sginsberg] 42795: Don't use dllexport for videoprt; we use a .spec. Also, don't use DDKAPI as it is a w32api/ReactOS define. We welcome videoprt into the club of modules compiling *and* linking under msvc.
by sginsberg＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: sginsberg Date: Thu Aug 20 12:29:54 2009 New Revision: 42795 URL: http://svn.reactos.org/svn/reactos?rev=42795&view=rev Log: Don't use dllexport for videoprt; we use a .spec. Also, don't use DDKAPI as it is a w32api/ReactOS define. We welcome videoprt into the club of modules compiling *and* linking under msvc. Modified: trunk/reactos/drivers/video/videoprt/stubs.c trunk/reactos/include/ddk/video.h Modified: trunk/reactos/drivers/video/videoprt/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/stu… ============================================================================== --- trunk/reactos/drivers/video/videoprt/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/stubs.c [iso-8859-1] Thu Aug 20 12:29:54 2009 @@ -24,9 +24,8 @@ #include "videoprt.h" #include <wdmguid.h> -VIDEOPORT_API VP_STATUS -DDKAPI +NTAPI VideoPortFlushRegistry( PVOID HwDeviceExtension) { @@ -34,9 +33,8 @@ return 0; } -VIDEOPORT_API ULONG -DDKAPI +NTAPI VideoPortGetAssociatedDeviceID( IN PVOID DeviceObject) { @@ -45,9 +43,8 @@ } -VIDEOPORT_API ULONG -DDKAPI +NTAPI VideoPortGetBytesUsed( IN PVOID HwDeviceExtension, IN PDMA pDma) @@ -56,9 +53,8 @@ return 0; } -VIDEOPORT_API PVOID -DDKAPI +NTAPI VideoPortGetMdl( IN PVOID HwDeviceExtension, IN PDMA pDma) @@ -67,9 +63,8 @@ return 0; } -VIDEOPORT_API BOOLEAN -DDKAPI +NTAPI VideoPortLockPages( IN PVOID HwDeviceExtension, IN OUT PVIDEO_REQUEST_PACKET pVrp, @@ -81,9 +76,8 @@ return 0; } -VIDEOPORT_API LONG -DDKAPI +NTAPI VideoPortReadStateEvent( IN PVOID HwDeviceExtension, IN PEVENT pEvent) @@ -92,9 +86,8 @@ return 0; } -VIDEOPORT_API VOID -DDKAPI +NTAPI VideoPortSetBytesUsed( IN PVOID HwDeviceExtension, IN OUT PDMA pDma, @@ -103,9 +96,8 @@ UNIMPLEMENTED; } -VIDEOPORT_API BOOLEAN -DDKAPI +NTAPI VideoPortUnlockPages( IN PVOID hwDeviceExtension, IN PDMA pDma) @@ -113,5 +105,3 @@ UNIMPLEMENTED; return 0; } - - Modified: trunk/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/video.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/video.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/video.h [iso-8859-1] Thu Aug 20 12:29:54 2009 @@ -28,7 +28,7 @@ #else #if defined(_VIDEOPORT_) - #define VPAPI DECLSPEC_EXPORT + #define VPAPI #else #define VPAPI DECLSPEC_IMPORT #endif

1 0

[cwittich] 42794: sync cryptui with wine 1.1.27
by cwittich＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: cwittich Date: Thu Aug 20 12:22:38 2009 New Revision: 42794 URL: http://svn.reactos.org/svn/reactos?rev=42794&view=rev Log: sync cryptui with wine 1.1.27 Added: trunk/reactos/dll/win32/cryptui/cryptui_Lt.rc (with props) trunk/reactos/dll/win32/cryptui/cryptui_Pt.rc (with props) Modified: trunk/reactos/dll/win32/cryptui/cryptui.rc trunk/reactos/dll/win32/cryptui/cryptui_En.rc trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc trunk/reactos/dll/win32/cryptui/cryptui_Ko.rc trunk/reactos/dll/win32/cryptui/cryptui_Nl.rc trunk/reactos/dll/win32/cryptui/main.c Modified: trunk/reactos/dll/win32/cryptui/cryptui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.rc [iso-8859-1] Thu Aug 20 12:22:38 2009 @@ -50,4 +50,6 @@ #include "cryptui_En.rc" #include "cryptui_Fr.rc" #include "cryptui_Ko.rc" +#include "cryptui_Lt.rc" #include "cryptui_Nl.rc" +#include "cryptui_Pt.rc" Modified: trunk/reactos/dll/win32/cryptui/cryptui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui_En.rc [iso-8859-1] Thu Aug 20 12:22:38 2009 @@ -285,16 +285,16 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Welcome to the Certificate Import Wizard", IDC_IMPORT_TITLE, - 115,1,195,40 + 115,7,195,12 LTEXT "This wizard helps you import certificates, certificate revocation lists, and certificate trust lists from a file to a certificate store.", - -1, 115,33,195,16 + -1, 115,26,195,25 LTEXT "A certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.", -1, 115,56,195,40 LTEXT "To continue, click Next.", -1, 115,103,195,8 END -IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,143 +IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,178 CAPTION "Certificate Import Wizard" FONT 8, "MS Shell Dlg" BEGIN @@ -325,7 +325,7 @@ PUSHBUTTON "B&rowse...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14 END -IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,178 CAPTION "Certificate Import Wizard" FONT 8, "MS Shell Dlg" BEGIN @@ -381,9 +381,9 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Welcome to the Certificate Export Wizard", IDC_EXPORT_TITLE, - 115,1,195,40 + 115,7,195,12 LTEXT "This wizard helps you export certificates, certificate revocation lists, and certificate trust lists from a certificate store to a file.", - -1, 115,33,195,16 + -1, 115,26,195,25 LTEXT "A certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.", -1, 115,56,195,40 LTEXT "To continue, click Next.", @@ -394,8 +394,8 @@ CAPTION "Certificate Export Wizard" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "If you choose to export the private key, you will be prompted for a password to protect the private key on a later page.", -1, 21,1,195,23 - LTEXT "Do you wish to export the private key?", -1, 21,24,195,15 + LTEXT "If you choose to export the private key, you will be prompted for a password to protect the private key on a later page.", -1, 21,1,195,25 + LTEXT "Do you wish to export the private key?", -1, 21,27,195,10 AUTORADIOBUTTON "&Yes, export the private key", IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "N&o, do not export the private key", @@ -419,22 +419,22 @@ BEGIN LTEXT "Select the format you want to use:", -1, 21,1,195,10 AUTORADIOBUTTON "&DER-encoded X.509 (.cer)", - IDC_EXPORT_FORMAT_DER, 31,18,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "Ba&se64-encoded X.509 (.cer):", - IDC_EXPORT_FORMAT_BASE64, 31,30,200,12, BS_AUTORADIOBUTTON + IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)", - IDC_EXPORT_FORMAT_CMS, 31,42,200,12, BS_AUTORADIOBUTTON + IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON CHECKBOX "&Include all certificates in the certification path if possible", - IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED AUTORADIOBUTTON "&Personal Information Exchange/PKCS #12 (.pfx)", - IDC_EXPORT_FORMAT_PFX, 31,72,200,12, BS_AUTORADIOBUTTON|WS_DISABLED + IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED CHECKBOX "Incl&ude all certificates in the certification path if possible", - IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "&Enable strong encryption", - IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,200,8, + IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "Delete the private &key if the export is successful", - IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,200,8, + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED END @@ -447,7 +447,7 @@ PUSHBUTTON "B&rowse...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14 END -IDD_EXPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +IDD_EXPORT_FINISH DIALOG DISCARDABLE 0,0,317,178 CAPTION "Certificate Export Wizard" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc [iso-8859-1] Thu Aug 20 12:22:38 2009 @@ -74,12 +74,12 @@ IDS_IMPORT_FILE_SUBTITLE "SpÃ©cifiez le fichier Ã importer." IDS_IMPORT_STORE_TITLE "Magasin de certificats" IDS_IMPORT_STORE_SUBTITLE "Les magasins de certificats sont des collections de certificats, de listes de rÃ©vocation de certificats et de listes de certificats de confiance." - IDS_IMPORT_FILTER_CERT "Certificat X.509 (*.cer; *.crt)" - IDS_IMPORT_FILTER_PFX "Ãchange d'informations personnelles (*.pfx; *.p12)" + IDS_IMPORT_FILTER_CERT "Certificat X.509 (*.cer ; *.crt)" + IDS_IMPORT_FILTER_PFX "Ãchange d'informations personnelles (*.pfx ; *.p12)" IDS_IMPORT_FILTER_CRL "Liste de rÃ©vocation de certificats (*.crl)" IDS_IMPORT_FILTER_CTL "Liste de certificats de confiance (*.stl)" IDS_IMPORT_FILTER_SERIALIZED_STORE "Magasin de certificats sÃ©rialisÃ©s Microsoft (*.sst)" - IDS_IMPORT_FILTER_CMS "Messages CMS/PKCS #7 (*.spc; *.p7b)" + IDS_IMPORT_FILTER_CMS "Messages CMS/PKCS #7 (*.spc ; *.p7b)" IDS_IMPORT_FILTER_ALL "Tous les fichiers (*.*)" IDS_IMPORT_EMPTY_FILE "SÃ©lectionnez un fichier." IDS_IMPORT_BAD_FORMAT "Le format du fichier n'est pas reconnu. SÃ©lectionnez un autre fichier." @@ -146,7 +146,7 @@ IDS_PURPOSE_CA_EXCHANGE "Archivage de clÃ© privÃ©e" IDS_PURPOSE_KEY_RECOVERY_AGENT "Agent de recouvrement de clÃ©" IDS_PURPOSE_DS_EMAIL_REPLICATION "RÃ©plication de courriers Ã©lectroniques du service d'annuaire" - IDS_EXPORT_WIZARD "Assistant Exportation de certificat" + IDS_EXPORT_WIZARD "Assistant Exportation de certificats" IDS_EXPORT_FORMAT_TITLE "Format d'export" IDS_EXPORT_FORMAT_SUBTITLE "Choisissez le format dans lequel le contenu sera sauvÃ©." IDS_EXPORT_FILE_TITLE "Nom du fichier Ã exporter" @@ -191,8 +191,8 @@ CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1 CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90 - PUSHBUTTON "&Installer un certificat...", IDC_ADDTOSTORE,103,216,70,14 - PUSHBUTTON "&DÃ©claration de l'Ã©metteur", IDC_ISSUERSTATEMENT,177,216,70,14 + PUSHBUTTON "&Installer un certificat...", IDC_ADDTOSTORE,73,216,86,14 + PUSHBUTTON "&DÃ©claration de l'Ã©metteur", IDC_ISSUERSTATEMENT,161,216,86,14 END IDD_DETAIL DIALOG DISCARDABLE 0, 0, 255, 236 @@ -200,16 +200,16 @@ STYLE WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Afficher :", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 28,10,100,14, + LTEXT "&Afficher :", -1, 6,11,33,14 + COMBOBOX IDC_DETAIL_SELECT, 39,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 - PUSHBUTTON "Ã&diter les propriÃ©tÃ©s...", IDC_EDITPROPERTIES,103,216,70,14 - PUSHBUTTON "&Copier dans le fichier...", IDC_EXPORT,177,216,70,14 + PUSHBUTTON "Ã&diter les propriÃ©tÃ©s...", IDC_EDITPROPERTIES,83,216,80,14 + PUSHBUTTON "&Copier dans le fichier...", IDC_EXPORT,167,216,80,14 END IDD_HIERARCHY DIALOG DISCARDABLE 0, 0, 255, 236 @@ -221,7 +221,7 @@ CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER, 13,22,231,130 PUSHBUTTON "&Voir le certificat", IDC_VIEWCERTIFICATE,175,156,70,14 - LTEXT "Ã&tant du certificat :", IDC_CERTIFICATESTATUS,6,183,70,14 + LTEXT "Ã&tat du certificat :", IDC_CERTIFICATESTATUS,6,183,70,14 CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W", WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36 END @@ -233,8 +233,8 @@ BEGIN CONTROL "", IDC_USERNOTICE,"RichEdit20W", WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200 - PUSHBUTTON "Fermer", IDOK,103,216,70,14 - PUSHBUTTON "&Informations complÃ©mentaires", IDC_CPS,177,216,70,14 + PUSHBUTTON "Fermer", IDOK,77,216,83,14 + PUSHBUTTON "&Infos complÃ©mentaires", IDC_CPS,164,216,83,14 END IDD_CERT_PROPERTIES_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 @@ -244,7 +244,7 @@ BEGIN LTEXT "&Nom convivial :", -1, 6,14,60,14 EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP - LTEXT "&Description:", -1, 6,32,60,14 + LTEXT "&Description :", -1, 6,32,60,14 EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL GROUPBOX "RÃ´les du certificat", -1,6,48,245,165, BS_GROUPBOX AUTORADIOBUTTON "Activer &tous les rÃ´les prÃ©vus pour ce certificat", @@ -256,7 +256,7 @@ CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 24,100,220,90 - PUSHBUTTON "&Ajouter un rÃ´le...", IDC_ADD_PURPOSE,184,194,60,14 + PUSHBUTTON "&Ajouter un rÃ´le...", IDC_ADD_PURPOSE,180,194,64,14 END IDD_ADD_CERT_PURPOSE DIALOG DISCARDABLE 0,0,200,68 @@ -277,7 +277,7 @@ LTEXT "SÃ©lectionnez le magasin de certificats Ã utiliser :", IDC_STORE_TEXT, 6,6,190,28 CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP, 6,28,188,70 - CHECKBOX "&Montrer les magasins (emplacements de stockage) physiques", IDC_SHOW_PHYSICAL_STORES, 6,102,90,14, + CHECKBOX "&Montrer les magasins physiques", IDC_SHOW_PHYSICAL_STORES, 6,102,117,14, BS_AUTOCHECKBOX|WS_TABSTOP PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON PUSHBUTTON "Annuler", IDCANCEL, 144,118,50,14 @@ -288,13 +288,13 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bienvenue dans l'assistant d'importation de certificats", IDC_IMPORT_TITLE, - 115,1,195,40 + 115,6,195,12 LTEXT "Cet assistant vous aide Ã importer des certificats, des listes de rÃ©vocation de certificats et des listes de certificats de confiance dans un magasin de certificats Ã partir d'un fichier.", - -1, 115,33,195,16 + -1, 115,22,195,25 LTEXT "Un certificat peut Ãªtre utilisÃ© pour vous identifier, ou pour identifier l'ordinateur avec lequel vous communiquez. Il peut Ã©galement Ãªtre utilisÃ© Ã des fins d'authentification ou de signature de messages. Les magasins de certificats sont des collections de certificats, de listes de rÃ©vocation de certificats et de listes de certificats de confiance.", - -1, 115,56,195,40 - LTEXT "Pour continuer, cliquez Suivant.", - -1, 115,103,195,8 + -1, 115,56,195,49 + LTEXT "Pour continuer, cliquez sur Suivant.", + -1, 115,114,195,8 END IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,143 @@ -319,23 +319,23 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Wine peut sÃ©lectionner automatiquement un magasin de certificats, ou vous pouvez spÃ©cifier l'emplacement des certificats.", - -1, 21,1,195,20 + -1, 21,1,212,18 AUTORADIOBUTTON "SÃ©lectionner &automatiquement un magasin de certificats", - IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP + IDC_IMPORT_AUTO_STORE, 31,18,194,12, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "Placer tous les certificats dans le &magasin suivant :", - IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON + IDC_IMPORT_SPECIFY_STORE, 31,30,194,12, BS_AUTORADIOBUTTON EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY PUSHBUTTON "&Parcourir...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14 END -IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 -CAPTION "Assistant Importation de certificat" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "ClÃ´turer l'assistant d'importation de certificat", IDC_IMPORT_TITLE, - 115,1,195,40 - LTEXT "Vous avez terminÃ© avec succÃ¨s l'assistant d'importation de certificat.", - -1, 115,33,195,24 +IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,179 +CAPTION "Assistant Importation de certificats" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ClÃ´ture de l'assistant d'importation de certificats", IDC_IMPORT_TITLE, + 115,10,195,12 + LTEXT "Vous avez terminÃ© avec succÃ¨s l'assistant d'importation de certificats.", + -1, 115,31,195,18 LTEXT "Vous avez spÃ©cifiÃ© les paramÃ¨tres suivants :", -1, 115,57,195,12 CONTROL "", IDC_IMPORT_SETTINGS, "SysListView32", @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "RÃ´le du certificat", -1, 7,7,234,141, BS_GROUPBOX - LTEXT "SÃ©lectionnez un ou plusieurs rÃ´les Ã lister quand les options avancÃ©es sont sÃ©lectionnÃ©es.", + LTEXT "SÃ©lectionnez un ou plusieurs rÃ´les Ã afficher quand les options avancÃ©es sont sÃ©lectionnÃ©es.", -1, 14,18,220,16 LTEXT "&RÃ´les du certificat :", -1, 14,41,90,12, WS_TABSTOP CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", @@ -384,21 +384,21 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bienvenue dans l'assistant d'exportation de certificats", IDC_EXPORT_TITLE, - 115,1,195,40 + 115,6,195,12 LTEXT "Cet assistant vous aide Ã exporter des certificats, des listes de rÃ©vocation de certificats et des listes de certificats de confiance dans un fichier Ã partir d'un magasin de certificats.", - -1, 115,33,195,16 + -1, 115,22,195,25 LTEXT "Un certificat peut Ãªtre utilisÃ© pour vous identifier, ou pour identifier l'ordinateur avec lequel vous communiquez. Il peut Ã©galement Ãªtre utilisÃ© Ã des fins d'authentification ou de signature de messages. Les magasins de certificats sont des collections de certificats, de listes de rÃ©vocation de certificats et de listes de certificats de confiance.", - -1, 115,56,195,40 - LTEXT "Pour continuer, cliquez Suivant.", - -1, 115,103,195,8 + -1, 115,56,195,49 + LTEXT "Pour continuer, cliquez sur Suivant.", + -1, 115,114,195,8 END IDD_EXPORT_PRIVATE_KEY DIALOG DISCARDABLE 0,0,317,143 -CAPTION "Assistant Exportation de certificat" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Si vous choisissez d'exporter la clÃ© privÃ©e, on vous demandera un mot de passe pour protÃ©ger la clÃ© privÃ©e dans une page ultÃ©rieure.", -1, 21,1,195,23 - LTEXT "Voulez-vous exporter la clÃ© privÃ©e ?", -1, 21,24,195,15 +CAPTION "Assistant Exportation de certificats" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Si vous choisissez d'exporter la clÃ© privÃ©e, on vous demandera un mot de passe pour protÃ©ger la clÃ© privÃ©e dans une page ultÃ©rieure.", -1, 21,1,195,25 + LTEXT "Voulez-vous exporter la clÃ© privÃ©e ?", -1, 21,27,195,10 AUTORADIOBUTTON "&Oui, exporter la clÃ© privÃ©e", IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "&Non, ne pas exporter la clÃ© privÃ©e", @@ -407,32 +407,32 @@ END IDD_EXPORT_PASSWORD DIALOG DISCARDABLE 0,0,317,143 -CAPTION "Assistant Exportation de certificat" +CAPTION "Assistant Exportation de certificats" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Mot de passe :", -1, 21,1,195,10 EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP - LTEXT "&Confirmez le mot de passe:", -1, 21,35,195,10 + LTEXT "&Confirmez le mot de passe :", -1, 21,35,195,10 EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP END IDD_EXPORT_FORMAT DIALOG DISCARDABLE 0,0,317,143 -CAPTION "Assistant Exportation de certificat" +CAPTION "Assistant Exportation de certificats" FONT 8, "MS Shell Dlg" BEGIN LTEXT "SÃ©lectionnez le format Ã utiliser :", -1, 21,1,195,10 AUTORADIOBUTTON "Binaire codÃ© &DER X.509 (*.cer)", IDC_EXPORT_FORMAT_DER, 31,18,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP - AUTORADIOBUTTON "Binaire codÃ© Ba&se64 X.509 (.cer):", + AUTORADIOBUTTON "Binaire codÃ© Ba&se64 X.509 (.cer) :", IDC_EXPORT_FORMAT_BASE64, 31,30,200,12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "Standard de syntaxe de message cryptographique - Messages PKCS #7 (.p7b)", IDC_EXPORT_FORMAT_CMS, 31,42,200,12, BS_AUTORADIOBUTTON CHECKBOX "&Inclure tous les certificats dans le chemin de certification si possible" - IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,230,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED AUTORADIOBUTTON "Ãchange d'informations &Personnelles - PKCS #12 (.pfx)", IDC_EXPORT_FORMAT_PFX, 31,72,200,12, BS_AUTORADIOBUTTON|WS_DISABLED CHECKBOX "Inclure &tous les certificats dans le chemin de certification si possible", - IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,230,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "&Activer le chiffrement fort", IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED @@ -442,7 +442,7 @@ END IDD_EXPORT_FILE DIALOG DISCARDABLE 0,0,317,143 -CAPTION "Assistant Exportation de certificat" +CAPTION "Assistant Exportation de certificats" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Nom du fichier :", -1, 21,1,195,10 @@ -450,14 +450,14 @@ PUSHBUTTON "Parco&urir...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14 END -IDD_EXPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 -CAPTION "Assistant Exportation de certificat" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "ClÃ´turer l'assistant d'exportation de certificat", IDC_EXPORT_TITLE, - 115,1,195,40 - LTEXT "Vous avez terminÃ© avec succÃ¨s l'assistant d'importation de certificat.", - -1, 115,33,195,24 +IDD_EXPORT_FINISH DIALOG DISCARDABLE 0,0,317,179 +CAPTION "Assistant Exportation de certificats" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ClÃ´ture de l'assistant d'exportation de certificats", IDC_EXPORT_TITLE, + 115,10,195,12 + LTEXT "Vous avez terminÃ© avec succÃ¨s l'assistant d'exportation de certificats.", + -1, 115,31,195,18 LTEXT "Vous avez spÃ©cifiÃ© les paramÃ¨tres suivants :", -1, 115,57,195,12 CONTROL "", IDC_EXPORT_SETTINGS, "SysListView32", Modified: trunk/reactos/dll/win32/cryptui/cryptui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui_Ko.rc [iso-8859-1] Thu Aug 20 12:22:38 2009 @@ -282,13 +282,13 @@ CAPTION "ÀÎÁõ¼ °¡Á®¿À±â ¸¶¹ý»ç" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ÀÎÁõ¼ °¡Á®¿À±â ¸¶¹ý»ç¿¡ ¿Â °ÍÀ» È¯¿µÇÕ´Ï´Ù", IDC_IMPORT_TITLE,115,1,195,40 - LTEXT "ÀÌ ¸¶¹ý»ç´Â ´ç½ÅÀÌ ÆÄÀÏ·ÎºÎÅÍ ÀÎÁõ¼,ÀÎÁõ¼ ÆÄ±â ¸ñ·Ï,ÀÎÁõ¼ ½Å·Ú ¸ñ·ÏÀ» ÀÎÁõ¼ º¸°ü¼Ò¿¡ °¡Á®¿À´Â °ÍÀ» µµ¿ÍÁÝ´Ï´Ù.",-1, 115,33,195,16 + LTEXT "ÀÎÁõ¼ °¡Á®¿À±â ¸¶¹ý»ç¿¡ ¿Â °ÍÀ» È¯¿µÇÕ´Ï´Ù", IDC_IMPORT_TITLE,115,7,195,12 + LTEXT "ÀÌ ¸¶¹ý»ç´Â ´ç½ÅÀÌ ÆÄÀÏ·ÎºÎÅÍ ÀÎÁõ¼,ÀÎÁõ¼ ÆÄ±â ¸ñ·Ï,ÀÎÁõ¼ ½Å·Ú ¸ñ·ÏÀ» ÀÎÁõ¼ º¸°ü¼Ò¿¡ °¡Á®¿À´Â °ÍÀ» µµ¿ÍÁÝ´Ï´Ù.",-1, 115,26,195,25 LTEXT "ÀÌ ÀÎÁõ¼´Â ´ç½ÅÀÌ³ª ´ç½ÅÀÌ Åë½Å¿¡ »ç¿ëÇÏ´Â ÄÄÇ»ÅÍ¸¦ ½Å¿øº¸ÁõÇÏ´Â µ¥ »ç¿ëµË´Ï´Ù. ¶ÇÇÑ ¸Þ¼¼Áö¿¡ »çÀÎÇÏ°í ÀÎÁõÇÏ´Â µ¥µµ »ç¿ëµË´Ï´Ù. ÀÎÁõ¼ º¸°ü¼Ò´Â ÀÎÁõ¼, ÀÎÁõ¼ ÆÄ±â ¸ñ·Ï, ÀÎÁõ¼ ½Å·Ú ¸ñ·ÏÀÇ ÀúÀå¼ÒÀÔ´Ï´Ù.",-1, 115,56,195,40 LTEXT "°è¼ÓÇÏ·Á¸é, ´ÙÀ½À» Å¬¸¯ÇÏ½Ê½Ã¿À.",-1, 115,103,195,8 END -IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,143 +IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,178 CAPTION "ÀÎÁõ¼ °¡Á®¿À±â ¸¶¹ý»ç" FONT 8, "MS Shell Dlg" BEGIN @@ -312,7 +312,7 @@ PUSHBUTTON "Ã£±â(&R)...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14 END -IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,178 CAPTION "ÀÎÁõ¼ °¡Á®¿À±â ¸¶¹ý»ç" FONT 8, "MS Shell Dlg" BEGIN @@ -366,9 +366,9 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ÀÎÁõ¼ ³»º¸³»±â ¸¶¹ý»ç¿¡ ¿À½Å °ÍÀ» È¯¿µÇÕ´Ï´Ù", IDC_EXPORT_TITLE, - 115,1,195,40 + 115,7,195,12 LTEXT "ÀÌ ¸¶¹ý»ç´Â ÀÎÁõ¼,ÀÎÁõ¼ Æó±â ¸ñ·Ï,ÀÎÁõ¼ ½Å·Ú ¸ñ·ÏÀ» ÀÎÁõ¼ ÀúÀå¼Ò·ÎºÎÅÍ ÆÄÀÏ·Î ³»º¸³»´Â °ÍÀ» µµ¿ÍÁÙ°Ì´Ï´Ù.", - -1, 115,33,195,16 + -1, 115,26,195,25 LTEXT " ÀÎÁõ¼´Â ´ç½ÅÀÌ³ª ´ç½ÅÀÌ Åë½Å¿¡ »ç¿ëÇÏ´Â ÄÄÇ»ÅÍ¸¦ ½Å¿øº¸ÁõÇÏ´Â µ¥ »ç¿ëµË´Ï´Ù. ¶ÇÇÑ ¸Þ¼¼Áö¿¡ »çÀÎÇÏ°í ÀÎÁõÇÏ´Â µ¥µµ »ç¿ëµË´Ï´Ù. ÀÎÁõ¼ º¸°ü¼Ò´Â ÀÎÁõ¼, ÀÎÁõ¼ ÆÄ±â ¸ñ·Ï, ÀÎÁõ¼ ½Å·Ú ¸ñ·ÏÀÇ ÀúÀå¼ÒÀÔ´Ï´Ù..", -1, 115,56,195,40 LTEXT "°è¼Ó ÇÏ½Ç·Á¸é, <´ÙÀ½>À» Å¬¸¯ÇÏ½Ê½Ã¿À.", @@ -379,8 +379,8 @@ CAPTION "ÀÎÁõ¼ ³»º¸³»±â ¸¶¹ý»ç" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "´ç½ÅÀÌ °³ÀÎ Å°¸¦ ³»º¸³»±â¸¦ ¼±ÅÃÇÏ¸é, ´ç½ÅÀº ´ÙÀ½ ÆäÀÌÁö¿¡¼ °³ÀÎ Å°¸¦ º¸È£ÇÒ ¾ÏÈ£¸¦ ÀÔ·ÂÇÏ°Ô µÉ °ÍÀÔ´Ï´Ù.", -1, 21,1,195,23 - LTEXT "°³ÀÎ Å°¸¦ ³»º¸³»±â¸¦ ¿øÇÕ´Ï±î?", -1, 21,24,195,15 + LTEXT "´ç½ÅÀÌ °³ÀÎ Å°¸¦ ³»º¸³»±â¸¦ ¼±ÅÃÇÏ¸é, ´ç½ÅÀº ´ÙÀ½ ÆäÀÌÁö¿¡¼ °³ÀÎ Å°¸¦ º¸È£ÇÒ ¾ÏÈ£¸¦ ÀÔ·ÂÇÏ°Ô µÉ °ÍÀÔ´Ï´Ù.", -1, 21,1,195,25 + LTEXT "°³ÀÎ Å°¸¦ ³»º¸³»±â¸¦ ¿øÇÕ´Ï±î?", -1, 21,27,195,10 AUTORADIOBUTTON "¿¹(&Y), °³ÀÎ Å° ³»º¸³»±â", IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "¾Æ´Ï¿À(&O), °³ÀÎ Å° ¾È ³»º¸³»±â", @@ -404,22 +404,22 @@ BEGIN LTEXT "»ç¿ëÇÒ ÆÄÀÏ Çü½Ä ¼±ÅÃ:", -1, 21,1,195,10 AUTORADIOBUTTON "&DER-¾ÏÈ£ÈµÈ X.509 (.cer)", - IDC_EXPORT_FORMAT_DER, 31,18,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "Ba&se64-¾ÏÈ£ÈµÈ X.509 (.cer):", - IDC_EXPORT_FORMAT_BASE64, 31,30,200,12, BS_AUTORADIOBUTTON + IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "¾ÏÈ£ ¸Þ½ÃÁö ¹®¹ý Ç¥ÁØ/PKCS #7 ¸Þ½ÃÁö(&C) (.p7b)", - IDC_EXPORT_FORMAT_CMS, 31,42,200,12, BS_AUTORADIOBUTTON + IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON CHECKBOX "°¡´ÉÇÑ ÀÎÁõ¼ °æ·Î¿¡ ÀÖ´Â ¸ðµç ÀÎÁõ¼ Æ÷ÇÔ(&I)", - IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED AUTORADIOBUTTON "°³ÀÎ Á¤º¸ ±³È¯(&P)/PKCS #12 (.pfx)", - IDC_EXPORT_FORMAT_PFX, 31,72,200,12, BS_AUTORADIOBUTTON|WS_DISABLED + IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED CHECKBOX "°¡´ÉÇÑ ÀÎÁõ¼ °æ·Î¿¡ ÀÖ´Â ¸ðµç ÀÎÁõ¼ Æ÷ÇÔ(&U)", - IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "°ÇÑ ¾ÏÈ£È °¡´É(&E)", - IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,200,8, + IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "³»º¸³»±â°¡ ¼º°øÇÏ¸é °³ÀÎ Å° Áö¿ì±â(&K)", - IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,200,8, + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED END @@ -432,7 +432,7 @@ PUSHBUTTON "Ã£±â(&R)...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14 END -IDD_EXPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +IDD_EXPORT_FINISH DIALOG DISCARDABLE 0,0,317,178 CAPTION "ÀÎÁõ¼ ³»º¸³»±â ¸¶¹ý»ç" FONT 8, "MS Shell Dlg" BEGIN Added: trunk/reactos/dll/win32/cryptui/cryptui_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui_Lt.rc (added) +++ trunk/reactos/dll/win32/cryptui/cryptui_Lt.rc [iso-8859-1] Thu Aug 20 12:22:38 2009 @@ -1,0 +1,466 @@ +/* + * cryptui dll resources + * + * Copyright 2009 Aurimas FiÅ¡eras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "cryptuires.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_CERTIFICATE "Liudijimas" + IDS_CERTIFICATEINFORMATION "Liudijimo informacija" + IDS_CERT_INFO_BAD_SIG "Å is liudijimas turi neteisingÄ paraÅ¡Ä. Liudijimas galÄjo bÅ«ti pakeistas ar paÅ¾eistas." + IDS_CERT_INFO_UNTRUSTED_CA "Å is vyriausiasis liudijimas yra nepatikimas. NorÄdami juo pasitikÄti Ä¯traukite jÄ¯ Ä¯ sistemos patikimÅ³ vyriausiÅ³jÅ³ liudijimÅ³ saugyklÄ." + IDS_CERT_INFO_UNTRUSTED_ROOT "Nepavyko patvirtinti Å¡io liudijimo pagal patikimÄ vyriausiÄjÄ¯ liudijimÄ." + IDS_CERT_INFO_PARTIAL_CHAIN "Nepavyko rasti liudijimo iÅ¡davÄjo." + IDS_CERT_INFO_BAD_PURPOSES "Nepavyko patikrinti visÅ³ Å¡io liudijimo paskirties tikslÅ³." + IDS_CERT_INFO_PURPOSES "Å is liudijimas yra skirtas Å¡iems tikslams:" + IDS_SUBJECT_HEADING "Kam iÅ¡duota: " + IDS_ISSUER_HEADING "IÅ¡davÄ: " + IDS_VALID_FROM "Galioja nuo " + IDS_VALID_TO " iki " + IDS_CERTIFICATE_BAD_SIGNATURE "Å is liudijimas turi neteisingÄ paraÅ¡Ä." + IDS_CERTIFICATE_BAD_TIME "Å is liudijimas jau nebegalioja arba dar negalioja." + IDS_CERTIFICATE_BAD_TIMENEST "Å io liudijimo galiojimo periodas yra didesnis uÅ¾ iÅ¡davÄjo." + IDS_CERTIFICATE_REVOKED "Å is liudijimas buvo panaikintas iÅ¡davÄjo." + IDS_CERTIFICATE_VALID "Å is liudijimas yra geras." + IDS_FIELD "Laukas" + IDS_VALUE "ReikÅ¡mÄ" + IDS_FIELDS_ALL "<visi laukai>" + IDS_FIELDS_V1 "Tik pirmos versijos laukai" + IDS_FIELDS_EXTENSIONS "Tik plÄtiniai" + IDS_FIELDS_CRITICAL_EXTENSIONS "Tik bÅ«tini plÄtiniai" + IDS_FIELDS_PROPERTIES "Tik savybÄs" + IDS_FIELD_VERSION "Versija" + IDS_FIELD_SERIAL_NUMBER "Numeris" + IDS_FIELD_ISSUER "IÅ¡davÄjas" + IDS_FIELD_VALID_FROM "Galioja nuo" + IDS_FIELD_VALID_TO "Galioja iki" + IDS_FIELD_SUBJECT "Subjektas" + IDS_FIELD_PUBLIC_KEY "VieÅ¡asis raktas" + IDS_FIELD_PUBLIC_KEY_FORMAT "%s (%d bitai)" + IDS_PROP_HASH "maiÅ¡a SHA1" + IDS_PROP_ENHKEY_USAGE "Ypatingas rakto naudojimas (savybÄ)" + IDS_PROP_FRIENDLY_NAME "DraugiÅ¡kas vardas" + IDS_PROP_DESCRIPTION "ApraÅ¡as" + IDS_CERTIFICATE_PROPERTIES "Liudijimo savybÄs" + IDS_CERTIFICATE_PURPOSE_ERROR "PraÅ¡au Ä¯veskite organizacijos identifikatoriÅ³ tokia forma: 1.2.3.4" + IDS_CERTIFICATE_PURPOSE_EXISTS "Ä®vestas organizacijos identifikatorius jau egzistuoja." + IDS_SELECT_STORE_TITLE "IÅ¡rinkite liudijimÅ³ saugyklÄ" + IDS_SELECT_STORE "PraÅ¡au iÅ¡rinkite liudijimÅ³ saugyklÄ." + IDS_IMPORT_WIZARD "Liudijimo importo vediklis" + IDS_IMPORT_TYPE_MISMATCH "Faile yra objektÅ³, kurie neatitinka nustatytÅ³ kriterijÅ³. PraÅ¡au iÅ¡rinkite kitÄ failÄ." + IDS_IMPORT_FILE_TITLE "Importo failas" + IDS_IMPORT_FILE_SUBTITLE "Nurodykite failÄ importui." + IDS_IMPORT_STORE_TITLE "LiudijimÅ³ saugykla" + IDS_IMPORT_STORE_SUBTITLE "LiudijimÅ³ saugyklos yra liudijimÅ³ rinkiniai, atÅ¡auktÅ³ liudijimÅ³ sÄraÅ¡ai ir patikintÅ³ liudijimÅ³ sÄraÅ¡ai." + IDS_IMPORT_FILTER_CERT "X.509 liudijimas (*.cer; *.crt)" + IDS_IMPORT_FILTER_PFX "AsmeninÄs informacijos mainai (*.pfx; *.p12)" + IDS_IMPORT_FILTER_CRL "AtÅ¡auktÅ³ liudijimÅ³ sÄraÅ¡as (*.crl)" + IDS_IMPORT_FILTER_CTL "PatikintÅ³ liudijimÅ³ sÄraÅ¡as (*.stl)" + IDS_IMPORT_FILTER_SERIALIZED_STORE "IÅ¡dÄstyta serijomis liudijimÅ³ saugykla (*.sst)" + IDS_IMPORT_FILTER_CMS "CMS/PKCS #7 praneÅ¡imai (*.spc; *.p7b)" + IDS_IMPORT_FILTER_ALL "Visi failai (*.*)" + IDS_IMPORT_EMPTY_FILE "PraÅ¡au iÅ¡rinkite failÄ." + IDS_IMPORT_BAD_FORMAT "NeatpaÅ¾intas failo formatas. PraÅ¡au iÅ¡rinkite kitÄ failÄ." + IDS_IMPORT_OPEN_FAILED "Nepavyko atverti " + IDS_IMPORT_DEST_DETERMINED "Nustatyta programos" + IDS_IMPORT_SELECT_STORE "PraÅ¡au iÅ¡rinkite saugyklÄ" + IDS_IMPORT_STORE_SELECTION "IÅ¡rinkta liudijimÅ³ saugykla" + IDS_IMPORT_DEST_AUTOMATIC "AutomatiÅ¡kai nustatyta programos" + IDS_IMPORT_FILE "Failas" + IDS_IMPORT_CONTENT "Turinys" + IDS_IMPORT_CONTENT_CERT "Liudijimas" + IDS_IMPORT_CONTENT_CRL "AtÅ¡auktÅ³ liudijimÅ³ sÄraÅ¡as" + IDS_IMPORT_CONTENT_CTL "PatikintÅ³ liudijimÅ³ sÄraÅ¡as" + IDS_IMPORT_CONTENT_CMS "CMS/PKCS #7 praneÅ¡imas" + IDS_IMPORT_CONTENT_PFX "AsmeninÄs informacijos mainai" + IDS_IMPORT_CONTENT_STORE "LiudijimÅ³ saugykla" + IDS_IMPORT_SUCCEEDED "Importas sÄkmingas." + IDS_IMPORT_FAILED "Importas nepavyko." + IDS_WIZARD_TITLE_FONT "Arial" + IDS_PURPOSE_ALL "<visos>" + IDS_PURPOSE_ADVANCED "<papildomos paskirtys>" + IDS_SUBJECT_COLUMN "Kam iÅ¡duotas" + IDS_ISSUER_COLUMN "IÅ¡davÄ" + IDS_EXPIRATION_COLUMN "Galiojimo data" + IDS_FRIENDLY_NAME_COLUMN "DraugiÅ¡kas vardas" + IDS_ALLOWED_PURPOSE_ALL "<visos>" + IDS_ALLOWED_PURPOSE_NONE "<jokios>" + IDS_WARN_REMOVE_MY "Su Å¡iuo liudijimu jÅ«s daugiau nebegalÄsite iÅ¡Å¡ifruoti praneÅ¡imÅ³ ar pasiraÅ¡yti praneÅ¡imÅ³.\nAr tikrai norite paÅ¡alinti Å¡Ä¯ liudijimÄ?" + IDS_WARN_REMOVE_PLURAL_MY "Su Å¡iuo liudijimu jÅ«s daugiau nebegalÄsite iÅ¡Å¡ifruoti praneÅ¡imÅ³ ar pasiraÅ¡yti praneÅ¡imÅ³.\nAr tikrai norite paÅ¡alinti Å¡iuos liudijimus?" + IDS_WARN_REMOVE_ADDRESSBOOK "Su Å¡iuo liudijimu jÅ«s daugiau nebegalÄsite iÅ¡Å¡ifruoti praneÅ¡imÅ³ ar patikrinti pasiraÅ¡ytÅ³ praneÅ¡imÅ³.\nAr tikrai norite paÅ¡alinti Å¡Ä¯ liudijimÄ?" + IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Su Å¡iuo liudijimu jÅ«s daugiau nebegalÄsite iÅ¡Å¡ifruoti praneÅ¡imÅ³ ar patikrinti pasiraÅ¡ytÅ³ praneÅ¡imÅ³.\nAr tikrai norite paÅ¡alinti Å¡iuos liudijimus?" + IDS_WARN_REMOVE_CA "Liudijimais, iÅ¡duotais Å¡ios liudijimo Ä¯staigos, nebebus pasitikima.\nAr tikrai norite paÅ¡alinti Å¡Ä¯ liudijimÄ?" + IDS_WARN_REMOVE_PLURAL_CA "Liudijimais, iÅ¡duotais Å¡iÅ³ liudijimo Ä¯staigÅ³, nebebus pasitikima.\nAr tikrai norite paÅ¡alinti Å¡iuos liudijimus?" + IDS_WARN_REMOVE_ROOT "Liudijimais, iÅ¡duotais Å¡ios vyriausiosios liudijimo Ä¯staigos, ar bet kurios jos iÅ¡duotos liudijimÅ³ Ä¯staigos liudijimais, nebebus pasitikima.\nAr tikrai norite paÅ¡alinti Å¡Ä¯ patikimÄ vyriausiÄjÄ¯ liudijimÄ?" + IDS_WARN_REMOVE_PLURAL_ROOT "Liudijimais, iÅ¡duotais Å¡iÅ³ vyriausiÅ³jÅ³ liudijimo Ä¯staigÅ³, ar bet kuriÅ³ jÅ³ iÅ¡duotÅ³ liudijimÅ³ Ä¯staigÅ³ liudijimais, nebebus pasitikima.\nAr tikrai norite paÅ¡alinti Å¡iuos patikimus vyriausiuosius liudijimus?" + IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Nebebus pasitikima programine Ä¯ranga pasiraÅ¡yta Å¡io leidÄjo.\nAr tikrai norite paÅ¡alinti Å¡Ä¯ liudijimÄ?" + IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Nebebus pasitikima programine Ä¯ranga pasiraÅ¡yta Å¡iÅ³ leidÄjÅ³.\nAr tikrai norite paÅ¡alinti Å¡iuos liudijimus?" + IDS_WARN_REMOVE_DEFAULT "Ar tikrai norite paÅ¡alinti Å¡Ä¯ liudijimÄ?" + IDS_WARN_REMOVE_PLURAL_DEFAULT "Ar tikrai norite paÅ¡alinti Å¡iuos liudijimus?" + IDS_CERT_MGR "Liudijimai" + IDS_PURPOSE_SERVER_AUTH "Garantuoja nutolusio kompiuterio tapatumÄ" + IDS_PURPOSE_CLIENT_AUTH "Ä®rodo jÅ«sÅ³ tapatumÄ nutolusiam kompiuteriui" + IDS_PURPOSE_CODE_SIGNING "Garantuoja, kad programinÄ Ä¯ranga yra iÅ¡ Å¡io leidÄjo\nApsaugo programinÄ Ä¯rangÄ nuo pakeitimÅ³ po iÅ¡leidimo" + IDS_PURPOSE_EMAIL_PROTECTION "Apsaugo el. paÅ¡to praneÅ¡imus" + IDS_PURPOSE_IPSEC "LeidÅ¾ia saugu ryÅ¡Ä¯ internete" + IDS_PURPOSE_TIMESTAMP_SIGNING "LeidÅ¾ia pasiraÅ¡yti duomenis dabartiniu laiku" + IDS_PURPOSE_CTL_USAGE_SIGNING "LeidÅ¾ia skaitmeniÅ¡kai pasiraÅ¡yti patikintÅ³ liudijimÅ³ sÄraÅ¡Ä" + IDS_PURPOSE_EFS "LeidÅ¾ia uÅ¾Å¡ifruoti duomenis diske" + IDS_PURPOSE_EFS_RECOVERY "FailÅ³ atkÅ«rimas" + IDS_PURPOSE_WHQL "Windows tvarkykliÅ³ patikra" + IDS_PURPOSE_NT5 "Windows sistemos komponentÅ³ patikra" + IDS_PURPOSE_OEM_WHQL "OEM Windows sistemos komponentÅ³ patikra" + IDS_PURPOSE_EMBEDDED_NT "Ä®taisytÅ³ Windows sistemos komponentÅ³ patikra" + IDS_PURPOSE_ROOT_LIST_SIGNER "Pagrindinio sÄraÅ¡o pasiraÅ¡ytojas" + IDS_PURPOSE_QUALIFIED_SUBORDINATION "Patikslintoji hierarchija" + IDS_PURPOSE_KEY_RECOVERY "Rakto atkÅ«rimas" + IDS_PURPOSE_DOCUMENT_SIGNING "DokumentÅ³ pasiraÅ¡ymas" + IDS_PURPOSE_LIFETIME_SIGNING "Gyvavimo ciklo pasiraÅ¡ymas" + IDS_PURPOSE_DRM "SkaitmeninÄs teisÄs" + IDS_PURPOSE_LICENSES "KodÅ³ pako licencijos" + IDS_PURPOSE_LICENSE_SERVER "LicencijÅ³ serverio patikra" + IDS_PURPOSE_ENROLLMENT_AGENT "Liudijimo uÅ¾klausos priemonÄ" + IDS_PURPOSE_SMARTCARD_LOGON "LustiniÅ³ korteliÅ³ Ä¯vedimas" + IDS_PURPOSE_CA_EXCHANGE "PrivaÄiojo rakto archyvavimas" + IDS_PURPOSE_KEY_RECOVERY_AGENT "Rakto atkÅ«rimo priemonÄ" + IDS_PURPOSE_DS_EMAIL_REPLICATION "KatalogÅ³ serverio el. paÅ¡to dauginimas" + IDS_EXPORT_WIZARD "Liudijimo eksporto vediklis" + IDS_EXPORT_FORMAT_TITLE "Eksporto formatas" + IDS_EXPORT_FORMAT_SUBTITLE "IÅ¡sirinkite formatÄ duomenims iÅ¡saugoti." + IDS_EXPORT_FILE_TITLE "Eksporto failas" + IDS_EXPORT_FILE_SUBTITLE "Nurodykite failÄ, kuriame bus iÅ¡saugoti duomenys." + IDS_EXPORT_FILE_EXISTS "Nurodytas failas egzistuoja. Ar norite jÄ¯ perraÅ¡yti?" + IDS_EXPORT_FILTER_CERT "DER-uÅ¾koduotas dvejetainis X.509 (*.cer)" + IDS_EXPORT_FILTER_BASE64_CERT "Base64-uÅ¾koduotas X.509 (*.cer)" + IDS_EXPORT_FILTER_CRL "AtÅ¡auktÅ³ liudijimÅ³ sÄraÅ¡as (*.crl)" + IDS_EXPORT_FILTER_CTL "PatikintÅ³ liudijimÅ³ sÄraÅ¡as (*.stl)" + IDS_EXPORT_FILTER_CMS "CMS/PKCS #7 praneÅ¡imai (*.p7b)" + IDS_EXPORT_FILTER_PFX "AsmeninÄs informacijos mainai (*.pfx)" + IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE "IÅ¡dÄstyta serijomis liudijimÅ³ saugykla (*.sst)" + IDS_EXPORT_FORMAT "Failo formatas" + IDS_EXPORT_INCLUDE_CHAIN "Apimti visus liudijimus liudijimÅ³ kelyje" + IDS_EXPORT_KEYS "Eksportuoti raktus" + IDS_YES "Taip" + IDS_NO "Ne" + IDS_EXPORT_SUCCEEDED "Eksportas sÄkmingas." + IDS_EXPORT_FAILED "Eksportas nepavyko." + IDS_EXPORT_PRIVATE_KEY_TITLE "Eksportuoti privatÅ³jÄ¯ raktÄ" + IDS_EXPORT_PRIVATE_KEY_SUBTITLE "Liudijimas turi privatÅ³jÄ¯ raktÄ, kuris gali bÅ«ti iÅ¡eksportuotas kartu su liudijimu." + IDS_EXPORT_PASSWORD_TITLE "Ä®veskite slaptaÅ¾odÄ¯" + IDS_EXPORT_PASSWORD_SUBTITLE "JÅ«s galite apsaugoti privatÅ³jÄ¯ raktÄ slaptaÅ¾odÅ¾iu." + IDS_EXPORT_PASSWORD_MISMATCH "SlaptaÅ¾odÅ¾iai nesutampa." + IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "Pastaba: nepavyko atverti privaÄiojo rakto Å¡iam liudijimui." + IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Pastaba: Å¡io liudijimo privatusis raktas neiÅ¡eksportuojamas." +} + +IDD_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "Bendras" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200 + CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", + ES_READONLY|WS_DISABLED,8,11,26,26 + CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", + ES_READONLY|WS_DISABLED,34,11,212,26 + CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1 + CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", + ES_READONLY|ES_MULTILINE,8,38,238,78 + CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1 + CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", + ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90 + PUSHBUTTON "&Ä®diegti liudijimÄ...", IDC_ADDTOSTORE,103,216,70,14 + PUSHBUTTON "IÅ¡davÄjo &teiginys", IDC_ISSUERSTATEMENT,177,216,70,14 +END + +IDD_DETAIL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "IÅ¡samiau" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Rodyti:", -1, 6,12,40,14 + COMBOBOX IDC_DETAIL_SELECT, 33,10,100,14, + CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + CONTROL "", IDC_DETAIL_LIST, "SysListView32", + LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 6,28,241,100 + CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", + ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 + PUSHBUTTON "Redaguoti &savybes...", IDC_EDITPROPERTIES,83,216,80,14 + PUSHBUTTON "&Kopijuoti Ä¯ failÄ...", IDC_EXPORT,167,216,80,14 +END + +IDD_HIERARCHY DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "Liudijimo kelias" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Liudijimo &kelias", -1,6,10,245,165, BS_GROUPBOX + CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER, + 13,22,231,130 + PUSHBUTTON "&PerÅ¾iÅ«rÄti liudijimÄ", IDC_VIEWCERTIFICATE,175,156,70,14 + LTEXT "Liudijimo &bÅ«sena:", IDC_CERTIFICATESTATUS,6,183,70,14 + CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W", + WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36 +END + +IDD_USERNOTICE DIALOG DISCARDABLE 0, 0, 255, 256 +CAPTION "GarantijÅ³ nedavimas" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_USERNOTICE,"RichEdit20W", + WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200 + PUSHBUTTON "UÅ¾verti", IDOK,93,216,75,14 + PUSHBUTTON "Daugiau &informacijos", IDC_CPS,172,216,75,14 +END + +IDD_CERT_PROPERTIES_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "Bendras" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&DraugiÅ¡kas vardas:", -1, 6,14,70,14 + EDITTEXT IDC_FRIENDLY_NAME, 70,12,181,14, ES_AUTOHSCROLL|WS_TABSTOP + LTEXT "&ApraÅ¡as:", -1, 6,32,70,14 + EDITTEXT IDC_DESCRIPTION, 70,30,181,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL + GROUPBOX "Liudijimo paskirtys", -1,6,48,245,165, BS_GROUPBOX + AUTORADIOBUTTON "&Ä®jungti visas Å¡io liudijimo paskirtis", + IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "IÅ¡j&ungti visas Å¡io liudijimo paskirtis", + IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "Ä®jungti &tik Å¡ias Å¡io liudijimo paskirtis:", + IDC_ENABLE_SELECTED_PURPOSES, 12,82,180,14, BS_AUTORADIOBUTTON + CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 24,100,220,90 + PUSHBUTTON "PridÄti &paskirtÄ¯...", IDC_ADD_PURPOSE,184,194,60,14 +END + +IDD_ADD_CERT_PURPOSE DIALOG DISCARDABLE 0,0,200,68 +CAPTION "PridÄti paskirtÄ¯" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "PridÄkite objekto identifikatoriÅ³ (OID) liudijimo paskirÄiai, kuriÄ norite pridÄti:", + -1, 6,6,190,28 + EDITTEXT IDC_NEW_PURPOSE, 6,28,190,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL + PUSHBUTTON "Gerai", IDOK, 33,48,60,14 + PUSHBUTTON "Atsisakyti", IDCANCEL, 100,48,60,14 +END + +IDD_SELECT_STORE DIALOG DISCARDABLE 0,0,200,136 +CAPTION "IÅ¡rinkite liudijimÅ³ saugyklÄ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "IÅ¡rinkite liudijimÅ³ saugyklÄ, kuriÄ norite naudoti:", IDC_STORE_TEXT, 6,6,190,28 + CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP, + 6,28,188,70 + CHECKBOX "&Rodyti fizines saugyklas", IDC_SHOW_PHYSICAL_STORES, 6,102,90,14, + BS_AUTOCHECKBOX|WS_TABSTOP + PUSHBUTTON "Gerai", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON + PUSHBUTTON "Atsisakyti", IDCANCEL, 144,118,50,14 +END + +IDD_IMPORT_WELCOME DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Liudijimo importo vediklis" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Sveiki atvÄrÄ liudijimo importo vediklÄ¯", IDC_IMPORT_TITLE, + 115,1,195,32 + LTEXT "Å is vediklis padÄs jums importuoti liudijimus, atÅ¡auktÅ³ liudijimÅ³ sÄraÅ¡us ir patikintÅ³ liudijimÅ³ sÄraÅ¡us iÅ¡ failo Ä¯ liudijimÅ³ saugyklÄ.", + -1, 115,25,195,24 + LTEXT "Liudijimas gali bÅ«ti naudojamas nustatyti jÅ«sÅ³ ar kompiuterio su kuriuo esate uÅ¾mezgÄ ryÅ¡Ä¯ tapatumÄ. Jis taip pat gali bÅ«ti naudojamas praneÅ¡imÅ³ pasiraÅ¡ymui. LiudijimÅ³ saugyklos yra liudijimÅ³ rinkiniai, atÅ¡auktÅ³ liudijimÅ³ sÄraÅ¡ai ir patikintÅ³ liudijimÅ³ sÄraÅ¡ai.", + -1, 115,56,195,40 + LTEXT "NorÄdami tÄsti, spauskite âToliauâ.", + -1, 115,103,195,8 +END + +IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Liudijimo importo vediklis" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Failas:", -1, 21,1,195,10 + EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + PUSHBUTTON "&Parinkti...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14 + LTEXT "Pastaba: Å ie failÅ³ formatai gali turÄti daugiau negu vienÄ liudijimÄ, atÅ¡auktÅ³ liudijimÅ³ sÄraÅ¡Ä ar patikintÅ³ liudijimÅ³ sÄraÅ¡Ä:", + -1, 21,26,265,16 + LTEXT "Kriptografinio praneÅ¡imo sintaksÄs standarto/PKCS #7 praneÅ¡imai (.p7b)", + -1, 31,49,265,10 + LTEXT "AsmeninÄs informacijos mainai/PKCS #12 (.pfx, .p12)", + -1, 31,64,265,10 + LTEXT "Microsoft iÅ¡dÄstyta serijomis liudijimÅ³ saugykla (.sst)", + -1, 31,79,265,10 +END + +IDD_IMPORT_STORE DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Liudijimo importo vediklis" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Wine gali automatiÅ¡kai parinkti liudijimÅ³ saugyklÄ arba jÅ«s galite nurodyti vietÄ liudijimams.", + -1, 21,1,195,20 + AUTORADIOBUTTON "AutomatiÅ¡kai pa&rinkti liudijimÅ³ saugyklÄ", + IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "Patalpinti &visus liudijimus Ä¯ Å¡iÄ saugyklÄ:", + IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON + EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY + PUSHBUTTON "&Parinkti...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14 +END + +IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Liudijimo importo vediklis" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Liudijimo importo vediklio pabaiga", IDC_IMPORT_TITLE, + 115,1,195,40 + LTEXT "JÅ«s sÄkmingai baigÄte liudijimo importo vediklÄ¯.", + -1, 115,33,195,24 + LTEXT "JÅ«s nurodÄte Å¡ias nuostatas:", + -1, 115,57,195,12 + CONTROL "", IDC_IMPORT_SETTINGS, "SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 115,67,174,100 +END + +IDD_CERT_MGR DIALOG DISCARDABLE 0,0,335,270 +CAPTION "Liudijimai" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Numatytos paskirtys:", -1, 7,9,100,12 + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, + CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + CONTROL "", IDC_MGR_STORES, "SysTabControl32", + WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 + CONTROL "", IDC_MGR_CERTS, "SysListView32", + LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 + PUSHBUTTON "&Importuoti...", IDC_MGR_IMPORT, 7,172,51,14 + PUSHBUTTON "&Eksportuoti...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED + PUSHBUTTON "&Å alinti", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED + PUSHBUTTON "IÅ¡s&amiau...", IDC_MGR_ADVANCED, 277,172,51,14 + GROUPBOX "Liudijimo numatytos paskirtys", -1,7,194,321,47, BS_GROUPBOX + LTEXT "", IDC_MGR_PURPOSES, 13,204,252,32 + PUSHBUTTON "&PerÅ¾iÅ«rÄti...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED + PUSHBUTTON "&UÅ¾verti", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON +END + +IDD_CERT_MGR_ADVANCED DIALOG DISCARDABLE 0,0,248,176 +CAPTION "IÅ¡samios parinktys" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Liudijimo paskirtis", -1, 7,7,234,141, BS_GROUPBOX + LTEXT "IÅ¡rinkite vienÄ ar daugiau paskirÄiÅ³ rodymui, kai yra pasirinkta âpapildomos paskirtysâ.", + -1, 14,18,220,16 + LTEXT "&Liudijimo paskirtys:", -1, 14,41,90,12, WS_TABSTOP + CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 14,51,220,90 + PUSHBUTTON "Gerai", IDOK, 132,155,51,14, BS_DEFPUSHBUTTON + PUSHBUTTON "Atsisakyti", IDCANCEL, 190,155,51,14 +END + +IDD_EXPORT_WELCOME DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Liudijimo eksporto vediklis" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Sveiki atvÄrÄ liudijimo eksporto vediklÄ¯", IDC_EXPORT_TITLE, + 115,1,195,32 + LTEXT "Å is valdiklis padÄs jums eksportuoti liudijimus, atÅ¡auktÅ³ liudijimÅ³ sÄraÅ¡us ir patikintÅ³ liudijimÅ³ sÄraÅ¡us iÅ¡ liudijimÅ³ saugyklos Ä¯ failÄ.", + -1, 115,25,195,24 + LTEXT "Liudijimas gali bÅ«ti naudojamas nustatyti jÅ«sÅ³ ar kompiuterio su kuriuo esate uÅ¾mezgÄ ryÅ¡Ä¯ tapatumÄ. Jis taip pat gali bÅ«ti naudojamas praneÅ¡imÅ³ pasiraÅ¡ymui. LiudijimÅ³ saugyklos yra liudijimÅ³ rinkiniai, atÅ¡auktÅ³ liudijimÅ³ sÄraÅ¡ai ir patikintÅ³ liudijimÅ³ sÄraÅ¡ai.", + -1, 115,56,195,40 + LTEXT "NorÄdami tÄsti, spauskite âToliauâ.", + -1, 115,103,195,8 +END + +IDD_EXPORT_PRIVATE_KEY DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Liudijimo eksporto vediklis" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Jei pasirinksite eksportuoti privatÅ³jÄ¯ raktÄ, kitame lape bÅ«site paklausti Ä¯vesti slaptaÅ¾odÄ¯ raktui apsaugoti.", -1, 21,1,195,23 + LTEXT "Ar norite eksportuoti privatÅ³jÄ¯ raktÄ?", -1, 21,24,195,15 + AUTORADIOBUTTON "&Taip, eksportuoti privatÅ³jÄ¯ raktÄ", + IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "&Ne, neeksportuoti privaÄiojo rakto", + IDC_EXPORT_PRIVATE_KEY_NO, 31,48,200,12, BS_AUTORADIOBUTTON + LTEXT "", IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE, 21,60,200,24 +END + +IDD_EXPORT_PASSWORD DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Liudijimo eksporto vediklis" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&SlaptaÅ¾odis:", -1, 21,1,195,10 + EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + LTEXT "&Patvirtinti slaptaÅ¾odÄ¯:", -1, 21,35,195,10 + EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP +END + +IDD_EXPORT_FORMAT DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Liudijimo eksporto vediklis" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "IÅ¡rinkite formatÄ, kurÄ¯ norite naudoti:", -1, 21,1,195,10 + AUTORADIOBUTTON "&DER-uÅ¾koduotas X.509 (.cer)", + IDC_EXPORT_FORMAT_DER, 31,18,260,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "Ba&se64-uÅ¾koduotas X.509 (.cer)", + IDC_EXPORT_FORMAT_BASE64, 31,30,260,12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Kriptografinio praneÅ¡imo sintaksÄs standarto/PKCS #7 praneÅ¡imas (.p7b):", + IDC_EXPORT_FORMAT_CMS, 31,42,260,12, BS_AUTORADIOBUTTON + CHECKBOX "&Jei Ä¯manoma, apimti visus liudijimus liudijimÅ³ kelyje", + IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + AUTORADIOBUTTON "&AsmeninÄs informacijos mainai/PKCS #12 (.pfx)", + IDC_EXPORT_FORMAT_PFX, 31,72,260,12, BS_AUTORADIOBUTTON|WS_DISABLED + CHECKBOX "A&pimti visus liudijimus liudijimÅ³ kelyje", + IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + CHECKBOX "Ä®jungti stiprÅ³ &Å¡ifravimÄ", + IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,200,8, + BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + CHECKBOX "IÅ¡&trinti privatÅ³jÄ¯ raktÄ, kai eksportas sÄkmingas", + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,200,8, + BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED +END + +IDD_EXPORT_FILE DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Liudijimo eksporto vediklis" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Failas:", -1, 21,1,195,10 + EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + PUSHBUTTON "&Parinkti...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14 +END + +IDD_EXPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Liudijimo eksporto vediklis" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Liudijimo eksporto vediklio pabaiga", IDC_EXPORT_TITLE, + 115,1,195,40 + LTEXT "JÅ«s sÄkmingai baigÄte liudijimo eksporto vediklÄ¯.", + -1, 115,33,195,24 + LTEXT "JÅ«s nurodÄte Å¡ias nuostatas:", + -1, 115,57,195,12 + CONTROL "", IDC_EXPORT_SETTINGS, "SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 115,67,174,100 +END Propchange: trunk/reactos/dll/win32/cryptui/cryptui_Lt.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/cryptui/cryptui_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui_Nl.rc [iso-8859-1] Thu Aug 20 12:22:38 2009 @@ -19,6 +19,8 @@ */ #include "cryptuires.h" + +#pragma code_page(65001) LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL @@ -75,7 +77,7 @@ IDS_IMPORT_FILTER_PFX "Persoonlijke informatie uitwisseling (*.pfx; *.p12)" IDS_IMPORT_FILTER_CRL "Certificaat terugroeplijst (*.crl)" IDS_IMPORT_FILTER_CTL "Certificaat vertrouwenslijst (*.stl)" - IDS_IMPORT_FILTER_SERIALIZED_STORE "Microsoft seriële certificatenopslag (*.sst)" + IDS_IMPORT_FILTER_SERIALIZED_STORE "Microsoft seriÃ«le certificatenopslag (*.sst)" IDS_IMPORT_FILTER_CMS "CMS/PKCS #7 berichten (*.spc; *.p7b)" IDS_IMPORT_FILTER_ALL "Alle bestanden (*.*)" IDS_IMPORT_EMPTY_FILE "Selecteer een bestand." @@ -97,7 +99,7 @@ IDS_IMPORT_FAILED "Het importeren is mislukt." IDS_WIZARD_TITLE_FONT "Arial" IDS_PURPOSE_ALL "<Alle>" - IDS_PURPOSE_ADVANCED "<Geadvanceerde doeleinden>" + IDS_PURPOSE_ADVANCED "<Geavanceerde doeleinden>" IDS_SUBJECT_COLUMN "Verstrekt aan" IDS_ISSUER_COLUMN "Uitgegeven door" IDS_EXPIRATION_COLUMN "Verloop datum" @@ -106,8 +108,8 @@ IDS_ALLOWED_PURPOSE_NONE "<Geen>" IDS_WARN_REMOVE_MY "U kunt niet langer berichten ontcijferen of ondertekenen met dit certificaat.\nWeet u zeker dat u dit certificaat wilt verwijderen?" IDS_WARN_REMOVE_PLURAL_MY "U kunt niet langer berichten ontcijferen of ondertekenen met deze certificaten.\nWeet u zeker dat u deze certificaten wilt verwijderen?" - IDS_WARN_REMOVE_ADDRESSBOOK "U kunt niet langer berichten coderen of verifiëren met dit certificaat.\nWeet u zeker dat u dit certificaat wilt verwijderen?" - IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "U kunt niet langer berichten coderen of verifiëren met deze certificaten.\nWeet u zeker dat u deze certificaten wilt verwijderen?" + IDS_WARN_REMOVE_ADDRESSBOOK "U kunt niet langer berichten coderen of verifiÃ«ren met dit certificaat.\nWeet u zeker dat u dit certificaat wilt verwijderen?" + IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "U kunt niet langer berichten coderen of verifiÃ«ren met deze certificaten.\nWeet u zeker dat u deze certificaten wilt verwijderen?" IDS_WARN_REMOVE_CA "Certificaten uitgegeven door deze certificaten autoriteit zullen niet meer vertrouwd worden.\nWeet u zeker dat u dit certificaat wilt verwijderen?" IDS_WARN_REMOVE_PLURAL_CA "Certificaten uitgegeven door deze certificaten autoriteiten zullen niet meer vertrouwd worden.\nWeet u zeker dat u deze certificaten wilt verwijderen?" IDS_WARN_REMOVE_ROOT "Certificaten uitgegeven door deze basic certificaten autoriteit, alsmede enige certificatie autoriteit die hij verstrekt, zullen niet meer vertrouwd worden.\nWeet u zeker dat u dit vertrouwde basic certificaat wilt verwijderen?" @@ -150,12 +152,12 @@ IDS_EXPORT_FILE_SUBTITLE "Geef de naam van het bestand waarin de inhoud zal worden opgeslagen." IDS_EXPORT_FILE_EXISTS "Het gekozen bestand bestaat reeds. Wilt u het overschrijven?" IDS_EXPORT_FILTER_CERT "DER-Encoded Binary X.509 (*.cer)" - IDS_EXPORT_FILTER_BASE64_CERT "Base64-geëncodeerd X.509 (*.cer)" + IDS_EXPORT_FILTER_BASE64_CERT "Base64-geÃ«ncodeerd X.509 (*.cer)" IDS_EXPORT_FILTER_CRL "Certificaat terugroeplijst (*.crl)" IDS_EXPORT_FILTER_CTL "Certificaat vertrouwenslijst (*.stl)" IDS_EXPORT_FILTER_CMS "CMS/PKCS #7 berichten (*.p7b)" IDS_EXPORT_FILTER_PFX "Persoonlijke informatie uitwisseling (*.pfx)" - IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE "Seriële certificatenopslag (*.sst)" + IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE "SeriÃ«le certificatenopslag (*.sst)" IDS_EXPORT_FORMAT "Bestandsformaat" IDS_EXPORT_INCLUDE_CHAIN "Neem alle certificaten in het certificatiepad op" IDS_EXPORT_KEYS "Exporteer sleutels" @@ -164,12 +166,12 @@ IDS_EXPORT_SUCCEEDED "Het exporteren is gelukt." IDS_EXPORT_FAILED "Het exporteren is mislukt." IDS_EXPORT_PRIVATE_KEY_TITLE "Exporteer persoonlijke sleutel" - IDS_EXPORT_PRIVATE_KEY_SUBTITLE "Het certificaat bevat een persoonlijke sleutel die mee kan worden geëxporteerd met het certificaat." + IDS_EXPORT_PRIVATE_KEY_SUBTITLE "Het certificaat bevat een persoonlijke sleutel die mee kan worden geÃ«xporteerd met het certificaat." IDS_EXPORT_PASSWORD_TITLE "Voer wachtwoord in" IDS_EXPORT_PASSWORD_SUBTITLE "U kunt een persoonlijke sleutel beveiligen met een wachtwoord." IDS_EXPORT_PASSWORD_MISMATCH "De wachtwoorden zijn niet gelijk." IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "NB: De persoonlijke sleutel voor dit certificaat kon niet geopend worden." - IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Note: De persoonlijke sleutel voor dit certificaat kan niet geëxporteerd worden." + IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Note: De persoonlijke sleutel voor dit certificaat kan niet geÃ«xporteerd worden." } IDD_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 @@ -286,12 +288,12 @@ BEGIN LTEXT "Welkom bij de certificaat importeerhulp", IDC_IMPORT_TITLE, 115,1,195,40 - LTEXT "Deze hulp helps u met het importeren van certificaten, certificaat terugroeplijsten en certificaat vertrouwenslijsten uit een bestand naar een certificatenopslag.", - -1, 115,33,195,16 + LTEXT "Deze hulp assisteert u met het importeren van certificaten, certificaat terugroeplijsten en certificaat vertrouwenslijsten uit een bestand naar een certificatenopslag.", + -1, 115,33,195,24 LTEXT "Een certificaat kan gebruikt worden om u of de computer waarmee u werkt te identificeren. Het kan ook gebruikt worden voor authenticatie en om berichten te ondertekenen. Certificatenopslagen zijn verzamelingen van certificaten, certificaat terugroeplijsten en certificaat vertrouwenslijsten.", - -1, 115,56,195,40 - LTEXT "Om verder te gaan, click op Volgende.", - -1, 115,103,195,8 + -1, 115,64,195,48 + LTEXT "Klik op Volgende om verder te gaan.", + -1, 115,119,195,8 END IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,143 @@ -301,13 +303,13 @@ LTEXT "Bestands&naam:", -1, 21,1,195,10 EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP PUSHBUTTON "B&laderen...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14 - LTEXT "NB: De volgende bestandsformaten kunnen meer dan één certificaat, certificaat terugroeplijst of certificaat vertrouwenslijst bevatten:", + LTEXT "NB: De volgende bestandsformaten kunnen meer dan Ã©Ã©n certificaat, certificaat terugroeplijst of certificaat vertrouwenslijst bevatten:", -1, 21,26,265,16 LTEXT "Cryptographisch berichtsyntaxis standaard/PKCS #7 berichten (.p7b)", -1, 31,49,265,10 LTEXT "Persoonlijke informatie uitwisseling/PKCS #12 (.pfx, .p12)", -1, 31,64,265,10 - LTEXT "Microsoft seriële certificatenopslag (.sst)", + LTEXT "Microsoft seriÃ«le certificatenopslag (.sst)", -1, 31,79,265,10 END @@ -354,7 +356,7 @@ PUSHBUTTON "&Importeer...", IDC_MGR_IMPORT, 7,172,51,14 PUSHBUTTON "&Exporteer...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED PUSHBUTTON "&Verwijder", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED - PUSHBUTTON "Ge&avanceerd...", IDC_MGR_ADVANCED, 277,172,51,14 + PUSHBUTTON "Ge&avanceerd...", IDC_MGR_ADVANCED, 271,172,57,14 GROUPBOX "Certificaat doeleinden", -1,7,194,321,47, BS_GROUPBOX LTEXT "", IDC_MGR_PURPOSES, 13,208,252,30 PUSHBUTTON "&Bekijken...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED @@ -382,12 +384,12 @@ BEGIN LTEXT "Welkom bij de Certificaat exporteerhulp", IDC_EXPORT_TITLE, 115,1,195,40 - LTEXT "Deze hulp assisteerd u bij het exporteren van certificaten, certificaat terugroeplijsten en certificaat vertrouwenslijsten vanuit een certificatenopslag naar een bestand.", - -1, 115,33,195,16 + LTEXT "Deze hulp assisteert u bij het exporteren van certificaten, certificaat terugroeplijsten en certificaat vertrouwenslijsten vanuit een certificatenopslag naar een bestand.", + -1, 115,33,195,24 LTEXT "Een certificaat kan gebruikt worden om u of de computer waarmee u werkt te identificeren. Het kan ook gebruikt worden voor authenticatie en om berichten te ondertekenen. Certificatenopslagen zijn verzamelingen van certificaten, certificaat terugroeplijsten en certificaat vertrouwenslijsten.", - -1, 115,56,195,40 - LTEXT "Om verder te gaan, click op Volgende.", - -1, 115,103,195,8 + -1, 115,64,195,48 + LTEXT "Klik op Volgende om verder te gaan.", + -1, 115,119,195,8 END IDD_EXPORT_PRIVATE_KEY DIALOG DISCARDABLE 0,0,317,143 @@ -419,22 +421,22 @@ BEGIN LTEXT "Selecteer het formaat dat u wilt gebruiken:", -1, 21,1,195,10 AUTORADIOBUTTON "&DER-encoded X.509 (.cer)", - IDC_EXPORT_FORMAT_DER, 31,18,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP - AUTORADIOBUTTON "Ba&se64-encoded X.509 (.cer):", - IDC_EXPORT_FORMAT_BASE64, 31,30,200,12, BS_AUTORADIOBUTTON + IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "Ba&se64-encoded X.509 (.cer)", + IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "&Cryptographisch berichtsyntaxis standaard/PKCS #7 berichten (.p7b)", - IDC_EXPORT_FORMAT_CMS, 31,42,200,12, BS_AUTORADIOBUTTON + IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON CHECKBOX "Neem &alle certificaten in het certificatiepad op indien mogelijk", - IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED AUTORADIOBUTTON "&Persoonlijke informatie uitwisseling/PKCS #12 (.pfx)", - IDC_EXPORT_FORMAT_PFX, 31,72,200,12, BS_AUTORADIOBUTTON|WS_DISABLED + IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED CHECKBOX "Nee&m alle certificaten in het certificatiepad op indien mogelijk", - IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "&Gebruikt sterke encryptie", - IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,200,8, + IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "Verwijder de persoonlijke s&leutel als de export succesvol is", - IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,200,8, + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED END Added: trunk/reactos/dll/win32/cryptui/cryptui_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui_Pt.rc (added) +++ trunk/reactos/dll/win32/cryptui/cryptui_Pt.rc [iso-8859-1] Thu Aug 20 12:22:38 2009 @@ -1,0 +1,465 @@ +/* + * cryptui dll Portuguese resources + * + * Copyright 2009 Ricardo Filipe + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "cryptuires.h" + +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE DISCARDABLE +{ + IDS_CERTIFICATE "Certificado" + IDS_CERTIFICATEINFORMATION "InformaÃ§Ã£o do Certificado" + IDS_CERT_INFO_BAD_SIG "Este certificado tem uma assinatura invÃ¡lida. O certificado pode ter sido alterado ou corrompido." + IDS_CERT_INFO_UNTRUSTED_CA "Este certificado raÃz nÃ£o Ã© confiÃ¡vel. Para ficar confiÃ¡vel, adicione-o ao conjunto de certificados raÃz confiÃ¡veis do seu sistema." + IDS_CERT_INFO_UNTRUSTED_ROOT "Este certificado nÃ£o foi validado num certificado raÃz confiÃ¡vel." + IDS_CERT_INFO_PARTIAL_CHAIN "O emissor deste certificado nÃ£o foi encontrado." + IDS_CERT_INFO_BAD_PURPOSES "Todos os propÃ³sitos deste certificado nÃ£o foram verificados." + IDS_CERT_INFO_PURPOSES "Este certificado Ã© intencionado com os seguintes propÃ³sitos::" + IDS_SUBJECT_HEADING "Emitido a: " + IDS_ISSUER_HEADING "Emitido por: " + IDS_VALID_FROM "VÃ¡lido de " + IDS_VALID_TO " para " + IDS_CERTIFICATE_BAD_SIGNATURE "Este certificado tem uma assinatura invÃ¡lida." + IDS_CERTIFICATE_BAD_TIME "Este certificado expirou ou ainda nÃ£o Ã© vÃ¡lido." + IDS_CERTIFICATE_BAD_TIMENEST "O perÃodo de validade deste certificado excede o do seu emissor." + IDS_CERTIFICATE_REVOKED "Este certificado foi revogado pelo seu emissor." + IDS_CERTIFICATE_VALID "Este certificado estÃ¡ OK." + IDS_FIELD "Campo" + IDS_VALUE "Valor" + IDS_FIELDS_ALL "<Todos>" + IDS_FIELDS_V1 "Campos da VersÃ£o 1 Apenas" + IDS_FIELDS_EXTENSIONS "ExtensÃµes Apenas" + IDS_FIELDS_CRITICAL_EXTENSIONS "ExtensÃµes CrÃticas Apenas" + IDS_FIELDS_PROPERTIES "Propriedades Apenas" + IDS_FIELD_VERSION "VersÃ£o" + IDS_FIELD_SERIAL_NUMBER "NÃºmero de SÃ©rie" + IDS_FIELD_ISSUER "Emissor" + IDS_FIELD_VALID_FROM "VÃ¡lido desde" + IDS_FIELD_VALID_TO "VÃ¡lido atÃ©" + IDS_FIELD_SUBJECT "Sujeito" + IDS_FIELD_PUBLIC_KEY "Chave PÃºblica" + IDS_FIELD_PUBLIC_KEY_FORMAT "%s (%d bits)" + IDS_PROP_HASH "SHA1 hash" + IDS_PROP_ENHKEY_USAGE "Uso de chave avanÃ§ado (propriedade)" + IDS_PROP_FRIENDLY_NAME "Nome amigÃ¡vel" + IDS_PROP_DESCRIPTION "DescriÃ§Ã£o" + IDS_CERTIFICATE_PROPERTIES "Propriedades do Certificado" + IDS_CERTIFICATE_PURPOSE_ERROR "Por favor insira um OID na forma 1.2.3.4" + IDS_CERTIFICATE_PURPOSE_EXISTS "O OID inserido jÃ¡ existe." + IDS_SELECT_STORE_TITLE "Seleccione o Conjunto de Certificados" + IDS_SELECT_STORE "Por favor seleccione um conjunto de certificados." + IDS_IMPORT_WIZARD "Assistente de ImportaÃ§Ã£o de Certificados" + IDS_IMPORT_TYPE_MISMATCH "O ficheiro contÃ©m objectos que nÃ£o correspondem ao critÃ©rio dado. Por favor seleccione outro ficheiro." + IDS_IMPORT_FILE_TITLE "Ficheiro a Importar" + IDS_IMPORT_FILE_SUBTITLE "Especifique o ficheiro que deseja Importar." + IDS_IMPORT_STORE_TITLE "Conjunto de Certificados" + IDS_IMPORT_STORE_SUBTITLE "Os Conjuntos de Certificados sÃ£o coleccÃµes de certificados, listas de revogaÃ§Ã£o de certificados e listas de certificados confiÃ¡veis." + IDS_IMPORT_FILTER_CERT "Certificado X.509 (*.cer; *.crt)" + IDS_IMPORT_FILTER_PFX "Troca de InformaÃ§Ãµes Pessoais (*.pfx; *.p12)" + IDS_IMPORT_FILTER_CRL "Lista de RevogaÃ§Ã£o de Certificados (*.crl)" + IDS_IMPORT_FILTER_CTL "Lista de Certificados ConfiÃ¡veis (*.stl)" + IDS_IMPORT_FILTER_SERIALIZED_STORE "Conjunto de Certificados Serializados da Microsoft (*.sst)" + IDS_IMPORT_FILTER_CMS "Mensagens CMS/PKCS #7 (*.spc; *.p7b)" + IDS_IMPORT_FILTER_ALL "Todos os Ficheiros (*.*)" + IDS_IMPORT_EMPTY_FILE "Por favor seleccione um ficheiro." + IDS_IMPORT_BAD_FORMAT "O formato do ficheiro nÃ£o Ã© reconhecido. Por favor seleccione outro ficheiro." + IDS_IMPORT_OPEN_FAILED "NÃ£o consegui abrir " + IDS_IMPORT_DEST_DETERMINED "Determinado pelo programa" + IDS_IMPORT_SELECT_STORE "Por favor seleccione um conjunto" + IDS_IMPORT_STORE_SELECTION "Conjunto de certificados seleccionado" + IDS_IMPORT_DEST_AUTOMATIC "Determinado automaticamente pelo programa" + IDS_IMPORT_FILE "Ficheiro" + IDS_IMPORT_CONTENT "ConteÃºdo" + IDS_IMPORT_CONTENT_CERT "Certificado" + IDS_IMPORT_CONTENT_CRL "Lista de RevogaÃ§Ã£o de Certificados" + IDS_IMPORT_CONTENT_CTL "Lista de Certificados ConfiÃ¡veis" + IDS_IMPORT_CONTENT_CMS "Mensagem CMS/PKCS #7" + IDS_IMPORT_CONTENT_PFX "Troca de InformaÃ§Ãµes Pessoais" + IDS_IMPORT_CONTENT_STORE "Conjunto de Certificados" + IDS_IMPORT_SUCCEEDED "A importaÃ§Ã£o foi bem sucedida." + IDS_IMPORT_FAILED "A importaÃ§Ã£o falhou." + IDS_WIZARD_TITLE_FONT "Arial" + IDS_PURPOSE_ALL "<Todos>" + IDS_PURPOSE_ADVANCED "<PropÃ³sitos AvanÃ§ados>" + IDS_SUBJECT_COLUMN "Emitido para" + IDS_ISSUER_COLUMN "Emitido por" + IDS_EXPIRATION_COLUMN "Data de ExpiraÃ§Ã£o" + IDS_FRIENDLY_NAME_COLUMN "Nome AmigÃ¡vel" + IDS_ALLOWED_PURPOSE_ALL "<Todos>" + IDS_ALLOWED_PURPOSE_NONE "<Nenhum>" + IDS_WARN_REMOVE_MY "NÃ£o vai poder continuar a decifrar ou assinar mensagens com este certificado.\nTem a certeza que deseja remover este certificado?" + IDS_WARN_REMOVE_PLURAL_MY "NÃ£o vai poder continuar a decifrar ou assinar mensagens com estes certificados.\nTem a certeza que deseja remover estes certificados?" + IDS_WARN_REMOVE_ADDRESSBOOK "NÃ£o vai poder continuar a cifrar ou verificar mensagens com este certificado.\nTem a certeza que deseja remover este certificado?" + IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "NÃ£o vai poder continuar a cifrar ou verificar mensagens com estes certificados.\nTem a certeza que deseja remover estes certificados?" + IDS_WARN_REMOVE_CA "Os certificados emitidos por esta autoridade de certificaÃ§Ã£o nÃ£o continuarÃ£o a ser confiÃ¡veis.\nTem a certeza que deseja remover este certificado?" + IDS_WARN_REMOVE_PLURAL_CA "Os certificados emitidos por estas autoridades de certificaÃ§Ã£o nÃ£o continuarÃ£o a ser confiÃ¡veis.\nTem a certeza que deseja remover estes certificados?" + IDS_WARN_REMOVE_ROOT "Os certificados emitidos por esta autoridade de certificaÃ§Ã£o raÃz ou quaisquer autoridades de certificaÃ§Ã£o por ela emitidas nÃ£o continuarÃ£o a ser confiÃ¡veis.\nTem a certeza que deseja remover este certificado raÃz confiÃ¡vel?" + IDS_WARN_REMOVE_PLURAL_ROOT "Os certificados emitidos por estas autoridades de certificaÃ§Ã£o raÃz ou quaisquer autoridades de certificaÃ§Ã£o por elas emitidas nÃ£o continuarÃ£o a ser confiÃ¡veis.\nTem a certeza que deseja remover estes certificados raÃz confiÃ¡veis?" + IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Software assinado por este editor nÃ£o continuarÃ¡ a ser confiÃ¡vel.\nTem a certeza que deseja remover este certificado?" + IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Software assinado por estes editores nÃ£o continuarÃ¡ a ser confiÃ¡vel.\nTem a certeza que deseja remover estes certificados?" + IDS_WARN_REMOVE_DEFAULT "Tem a certeza que deseja remover este certificado?" + IDS_WARN_REMOVE_PLURAL_DEFAULT "Tem a certeza que deseja remover estes certificados?" + IDS_CERT_MGR "Certificados" + IDS_PURPOSE_SERVER_AUTH "Assegura a identidade de um computador remoto" + IDS_PURPOSE_CLIENT_AUTH "Prova a sua identidade a um computador remoto" + IDS_PURPOSE_CODE_SIGNING "Assegura que o software veio de uma editora de software\nProtege o software de alteraÃ§Ãµes apÃ³s publicaÃ§Ã£o" + IDS_PURPOSE_EMAIL_PROTECTION "Protege mensagens de e-mail" + IDS_PURPOSE_IPSEC "Permite comunicaÃ§Ã£o segura pela Internet" + IDS_PURPOSE_TIMESTAMP_SIGNING "Permite que os dados sejam assinados com o tempo actual" + IDS_PURPOSE_CTL_USAGE_SIGNING "Permite que assine digitalmente uma lista de certificados confiÃ¡veis" + IDS_PURPOSE_EFS "Permite que os dados em disco sejam cifrados" + IDS_PURPOSE_EFS_RECOVERY "RecuperaÃ§Ã£o de Ficheiros" + IDS_PURPOSE_WHQL "Windows Hardware Driver Verification" + IDS_PURPOSE_NT5 "Windows System Component Verification" + IDS_PURPOSE_OEM_WHQL "OEM Windows System Component Verification" + IDS_PURPOSE_EMBEDDED_NT "Embedded Windows System Component Verification" + IDS_PURPOSE_ROOT_LIST_SIGNER "Root List Signer" + IDS_PURPOSE_QUALIFIED_SUBORDINATION "Qualified Subordination" + IDS_PURPOSE_KEY_RECOVERY "Key Recovery" + IDS_PURPOSE_DOCUMENT_SIGNING "Document Signing" + IDS_PURPOSE_LIFETIME_SIGNING "Lifetime Signing" + IDS_PURPOSE_DRM "Digital Rights" + IDS_PURPOSE_LICENSES "Key Pack Licenses" + IDS_PURPOSE_LICENSE_SERVER "License Server Verification" + IDS_PURPOSE_ENROLLMENT_AGENT "Certificate Request Agent" + IDS_PURPOSE_SMARTCARD_LOGON "Smart Card Logon" + IDS_PURPOSE_CA_EXCHANGE "Private Key Archival" + IDS_PURPOSE_KEY_RECOVERY_AGENT "Key Recovery Agent" + IDS_PURPOSE_DS_EMAIL_REPLICATION "Directory Service Email Replication" + IDS_EXPORT_WIZARD "Assistente de ExportaÃ§Ã£o de Certificados" + IDS_EXPORT_FORMAT_TITLE "Formato de ExportaÃ§Ã£o" + IDS_EXPORT_FORMAT_SUBTITLE "Escolha o formato em que o conteÃºdo serÃ¡ guardado." + IDS_EXPORT_FILE_TITLE "Exportar Ficheiro" + IDS_EXPORT_FILE_SUBTITLE "Especifique o nome do ficheiro em que o conteÃºdo serÃ¡ guardado." + IDS_EXPORT_FILE_EXISTS "O ficheiro especificado jÃ¡ existe. Deseja substituÃ-lo?" + IDS_EXPORT_FILTER_CERT "DER-Encoded Binary X.509 (*.cer)" + IDS_EXPORT_FILTER_BASE64_CERT "Base64-Encoded X.509 (*.cer)" + IDS_EXPORT_FILTER_CRL "Certificate Revocation List (*.crl)" + IDS_EXPORT_FILTER_CTL "Certificate Trust List (*.stl)" + IDS_EXPORT_FILTER_CMS "CMS/PKCS #7 Messages (*.p7b)" + IDS_EXPORT_FILTER_PFX "Personal Information Exchange (*.pfx)" + IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE "Serialized Certificate Store (*.sst)" + IDS_EXPORT_FORMAT "Formato do Ficheiro" + IDS_EXPORT_INCLUDE_CHAIN "Incluir todos os certificados no caminho do certificado" + IDS_EXPORT_KEYS "Exportar Chaves" + IDS_YES "Sim" + IDS_NO "NÃ£o" + IDS_EXPORT_SUCCEEDED "A exportaÃ§Ã£o foi bem sucedida." + IDS_EXPORT_FAILED "A exportaÃ§Ã£o falhou." + IDS_EXPORT_PRIVATE_KEY_TITLE "Exportar Chave Privada" + IDS_EXPORT_PRIVATE_KEY_SUBTITLE "O certificado contÃ©m uma chave privada que pode ser exportada em conjunto com o certificado." + IDS_EXPORT_PASSWORD_TITLE "Digite Palavra Chave" + IDS_EXPORT_PASSWORD_SUBTITLE "Pode proteger uma chave privada com uma palavra chave." + IDS_EXPORT_PASSWORD_MISMATCH "As palavras chave nÃ£o coincidem." + IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "Nota: A chave privada para este certificado nÃ£o conseguiu ser aberta." + IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Nota: A chave privada para este certificado nÃ£o Ã© exportÃ¡vel." +} + +IDD_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "Geral" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200 + CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", + ES_READONLY|WS_DISABLED,8,11,26,26 + CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", + ES_READONLY|WS_DISABLED,34,11,212,26 + CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1 + CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", + ES_READONLY|ES_MULTILINE,8,38,238,78 + CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1 + CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", + ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90 + PUSHBUTTON "&Instalar Certificado...", IDC_ADDTOSTORE,103,216,70,14 + PUSHBUTTON "&DeclaraÃ§Ã£o do Emissor", IDC_ISSUERSTATEMENT,177,216,70,14 +END + +IDD_DETAIL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "Detalhes" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Mostrar:", -1, 6,12,40,14 + COMBOBOX IDC_DETAIL_SELECT, 28,10,100,14, + CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + CONTROL "", IDC_DETAIL_LIST, "SysListView32", + LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 6,28,241,100 + CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", + ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 + PUSHBUTTON "&Editar Propriedades...", IDC_EDITPROPERTIES,103,216,70,14 + PUSHBUTTON "&Copiar para Ficheiro...", IDC_EXPORT,177,216,70,14 +END + +IDD_HIERARCHY DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "Caminho de CertificaÃ§Ã£o" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&Caminho de CertificaÃ§Ã£o", -1,6,10,245,165, BS_GROUPBOX + CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER, + 13,22,231,130 + PUSHBUTTON "&Ver Certificado", IDC_VIEWCERTIFICATE,175,156,70,14 + LTEXT "&Estado do Certificado:", IDC_CERTIFICATESTATUS,6,183,70,14 + CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W", + WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36 +END + +IDD_USERNOTICE DIALOG DISCARDABLE 0, 0, 255, 256 +CAPTION "DeclaraÃ§Ã£o" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_USERNOTICE,"RichEdit20W", + WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200 + PUSHBUTTON "&Fechar", IDOK,103,216,70,14 + PUSHBUTTON "&Mais InformaÃ§Ã£o", IDC_CPS,177,216,70,14 +END + +IDD_CERT_PROPERTIES_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "Geral" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nome amigÃ¡vel:", -1, 6,14,60,14 + EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP + LTEXT "&DescriÃ§Ã£o:", -1, 6,32,60,14 + EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL + GROUPBOX "PropÃ³sitos do Certificado", -1,6,48,245,165, BS_GROUPBOX + AUTORADIOBUTTON "&Activar todos os propÃ³sitos para este certificado", + IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "D&esactivar todos os propÃ³sitos para este certificado", + IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "A&ctivar apenas os seguintes propÃ³sitos para este certificado:", + IDC_ENABLE_SELECTED_PURPOSES, 12,82,180,14, BS_AUTORADIOBUTTON + CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 24,100,220,90 + PUSHBUTTON "Adicionar &PropÃ³sito...", IDC_ADD_PURPOSE,184,194,60,14 +END + +IDD_ADD_CERT_PURPOSE DIALOG DISCARDABLE 0,0,200,68 +CAPTION "Adicionar PropÃ³sito" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Adicione o identificador de objecto (OID) para o propÃ³sito que deseja adicionar:", + -1, 6,6,190,28 + EDITTEXT IDC_NEW_PURPOSE, 6,28,190,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL + PUSHBUTTON "OK", IDOK, 33,48,60,14 + PUSHBUTTON "Cancelar", IDCANCEL, 100,48,60,14 +END + +IDD_SELECT_STORE DIALOG DISCARDABLE 0,0,200,136 +CAPTION "Seleccione Conjunto de Certificados" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Seleccione o conjunto de certificados que deseja usar:", IDC_STORE_TEXT, 6,6,190,28 + CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP, + 6,28,188,70 + CHECKBOX "&Mostrar conjuntos fÃsicos", IDC_SHOW_PHYSICAL_STORES, 6,102,90,14, + BS_AUTOCHECKBOX|WS_TABSTOP + PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON + PUSHBUTTON "Cancelar", IDCANCEL, 144,118,50,14 +END + +IDD_IMPORT_WELCOME DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Assistente de ImportaÃ§Ã£o de Certificados" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Benvindo ao Assistente de ImportaÃ§Ã£o de Certificados", IDC_IMPORT_TITLE, + 115,7,195,12 + LTEXT "Este assistente vai ajudÃ¡-lo a importar certificados, listas de revogaÃ§Ã£o de certificados e listas de certificados confiÃ¡veis a partir de um ficheiro para um conjunto de certificados.", + -1, 115,26,195,25 + LTEXT "Um certificado pode ser usado para identificÃ¡-lo ou ao computador do qual estÃ¡ a comunicar. TambÃ©m pode ser usado para autenticaÃ§Ã£o e para assinar mensagens. Conjuntos de certificados sÃ£o colecÃ§Ãµes de certificados, listas de revogaÃ§Ã£o de certificados e listas de certificados confiÃ¡veis.", + -1, 115,56,195,40 + LTEXT "Para continuar clique em Seguinte.", + -1, 115,103,195,8 +END + +IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,178 +CAPTION "Assistente de ImportaÃ§Ã£o de Certificados" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nome do ficheiro:", -1, 21,1,195,10 + EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + PUSHBUTTON "&Procurar...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14 + LTEXT "Nota: os seguintes formatos de ficheiro podem conter mais que um certificado, lista de revogaÃ§Ã£o de certificados ou lista de certificados confiÃ¡veis:", + -1, 21,26,265,16 + LTEXT "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)", + -1, 31,49,265,10 + LTEXT "Personal Information Exchange/PKCS #12 (.pfx, .p12)", + -1, 31,64,265,10 + LTEXT "Microsoft Serialized Certificate Store (.sst)", + -1, 31,79,265,10 +END + +IDD_IMPORT_STORE DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Assistente de ImportaÃ§Ã£o de Certificados" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "O Wine pode automaticamente seleccionar o conjunto de certificados ou vocÃª pode especificar a localizaÃ§Ã£o para os certificados.", + -1, 21,1,195,20 + AUTORADIOBUTTON "&Seleccionar conjunto de certificados automaticamente", + IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "&Colocar todos os certificados no seguinte conjunto:", + IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON + EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY + PUSHBUTTON "&Procurar...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14 +END + +IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,178 +CAPTION "Assistente de ImportaÃ§Ã£o de Certificados" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A completar o Assistente de ImportaÃ§Ã£o de Certificados", IDC_IMPORT_TITLE, + 115,1,195,40 + LTEXT "Completou com sucesso o Assistente de ImportaÃ§Ã£o de Certificados.", + -1, 115,33,195,24 + LTEXT "Especificou as seguintes configuraÃ§Ãµes:", + -1, 115,57,195,12 + CONTROL "", IDC_IMPORT_SETTINGS, "SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 115,67,174,100 +END + +IDD_CERT_MGR DIALOG DISCARDABLE 0,0,335,270 +CAPTION "Certificados" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Com o propÃ³sito:", -1, 7,9,100,12 + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, + CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + CONTROL "", IDC_MGR_STORES, "SysTabControl32", + WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 + CONTROL "", IDC_MGR_CERTS, "SysListView32", + LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 + PUSHBUTTON "&Importar...", IDC_MGR_IMPORT, 7,172,51,14 + PUSHBUTTON "&Exportar...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED + PUSHBUTTON "&Remover", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED + PUSHBUTTON "&AvanÃ§adas...", IDC_MGR_ADVANCED, 277,172,51,14 + GROUPBOX "PropÃ³sitos do Certificado", -1,7,194,321,47, BS_GROUPBOX + LTEXT "", IDC_MGR_PURPOSES, 13,208,252,30 + PUSHBUTTON "&Ver...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED + PUSHBUTTON "&Fechar", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON +END + +IDD_CERT_MGR_ADVANCED DIALOG DISCARDABLE 0,0,248,176 +CAPTION "OpÃ§Ãµes AvanÃ§adas" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "PropÃ³sito do certificado", -1, 7,7,234,141, BS_GROUPBOX + LTEXT "Seleccione um ou mais propÃ³sitos a serem listados quando PropÃ³sitos AvanÃ§ados estiver seleccionado.", + -1, 14,18,220,16 + LTEXT "&PropÃ³sitos de Certificados:", -1, 14,41,90,12, WS_TABSTOP + CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 14,51,220,90 + PUSHBUTTON "OK", IDOK, 132,155,51,14, BS_DEFPUSHBUTTON + PUSHBUTTON "Cancelar", IDCANCEL, 190,155,51,14 +END + +IDD_EXPORT_WELCOME DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Assistente de ExportaÃ§Ã£o de Certificados" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Benvindo ao Assistente de ExportaÃ§Ã£o de Certificados", IDC_EXPORT_TITLE, + 115,7,195,12 + LTEXT "Este assostente vai ajudÃ¡-lo a exportar certificados, listas de revogaÃ§Ã£o de certificados e listas de certificados confiÃ¡veis a partir de um conjunto de certificados para um ficheiro.", + -1, 115,26,195,25 + LTEXT "Um certificado pode ser usado para identificÃ¡-lo ou ao computador de onde estÃ¡ a comunicar. Pode tambÃ©m ser usado para autenticaÃ§Ã£o e para assinar mensagens. Conjuntos de certificados sÃ£o colecÃ§Ãµes de certificados, listas de revogaÃ§Ã£o de certificados e listas de certificados confiÃ¡veis.", + -1, 115,56,195,40 + LTEXT "Para continuar clique em Seguinte.", + -1, 115,103,195,8 +END + +IDD_EXPORT_PRIVATE_KEY DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Assistente de ExportaÃ§Ã£o de Certificados" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Se escolher exportar a chave privada serÃ¡ pedida uma palavra-passe para proteger a chave privada mais Ã frente.", -1, 21,1,195,25 + LTEXT "Deseja exportar a chave privada?", -1, 21,27,195,10 + AUTORADIOBUTTON "&Sim, exportar a chave privada", + IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "&NÃ£o exportar a chave privada", + IDC_EXPORT_PRIVATE_KEY_NO, 31,48,200,12, BS_AUTORADIOBUTTON + LTEXT "", IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE, 21,60,200,24 +END + +IDD_EXPORT_PASSWORD DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Assistente de ExportaÃ§Ã£o de Certificados" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Palavra-passe:", -1, 21,1,195,10 + EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + LTEXT "&Confirmar palavra-passe:", -1, 21,35,195,10 + EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP +END + +IDD_EXPORT_FORMAT DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Assistente de ExportaÃ§Ã£o de Certificados" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Seleccione o formato que deseja utilizar:", -1, 21,1,195,10 + AUTORADIOBUTTON "&DER-encoded X.509 (.cer)", + IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "Ba&se64-encoded X.509 (.cer):", + IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)", + IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON + CHECKBOX "&Include all certificates in the certification path if possible", + IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + AUTORADIOBUTTON "&Personal Information Exchange/PKCS #12 (.pfx)", + IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED + CHECKBOX "&Incluir todos os certificados no caminho de certificaÃ§Ã£o se possÃvel", + IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + CHECKBOX "&Activar cifra forte", + IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8, + BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + CHECKBOX "&Apagar a chave privada se a exportaÃ§Ã£o for bem sucedida", + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8, + BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED +END + +IDD_EXPORT_FILE DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Assistente de ExportaÃ§Ã£o de Certificados" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nome do ficheiro:", -1, 21,1,195,10 + EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + PUSHBUTTON "&Procurar...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14 +END + +IDD_EXPORT_FINISH DIALOG DISCARDABLE 0,0,317,178 +CAPTION "Assistente de ExportaÃ§Ã£o de Certificados" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A completar o Assistente de ExportaÃ§Ã£o de Certificados", IDC_EXPORT_TITLE, + 115,1,195,40 + LTEXT "Completou com sucesso o Assistente de ExportaÃ§Ã£o de Certificados.", + -1, 115,33,195,24 + LTEXT "Especificou as seguintes configuraÃ§Ãµes:", + -1, 115,57,195,12 + CONTROL "", IDC_EXPORT_SETTINGS, "SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 115,67,174,100 +END Propchange: trunk/reactos/dll/win32/cryptui/cryptui_Pt.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/cryptui/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] Thu Aug 20 12:22:38 2009 @@ -5171,6 +5171,7 @@ selectInfo.parent = hwnd; selectInfo.dwFlags = CRYPTUI_ENABLE_SHOW_PHYSICAL_STORE; selectInfo.pwszTitle = NULL; + selectInfo.pwszText = NULL; selectInfo.pEnumData = &enumData; selectInfo.pfnSelectedStoreCallback = NULL; if ((store = CryptUIDlgSelectStoreW(&selectInfo)))

1 0

[cwittich] 42793: sync cryptnet with wine 1.1.27
by cwittich＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: cwittich Date: Thu Aug 20 12:19:17 2009 New Revision: 42793 URL: http://svn.reactos.org/svn/reactos?rev=42793&view=rev Log: sync cryptnet with wine 1.1.27 Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/cryptne… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] Thu Aug 20 12:19:17 2009 @@ -608,7 +608,7 @@ * creates a new cache entry for the object and writes the object to it. * Sets the expiration time of the cache entry to expires. */ -static void CRYPT_CacheURL(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject, +static void CRYPT_CacheURL(LPCWSTR pszURL, const CRYPT_BLOB_ARRAY *pObject, DWORD dwRetrievalFlags, FILETIME expires) { WCHAR cacheFileName[MAX_PATH]; @@ -692,7 +692,7 @@ } } -static BOOL CRYPT_Connect(URL_COMPONENTSW *components, +static BOOL CRYPT_Connect(const URL_COMPONENTSW *components, struct InetContext *context, PCRYPT_CREDENTIALS pCredentials, HINTERNET *phInt, HINTERNET *phHost) { @@ -1049,7 +1049,7 @@ } static BOOL WINAPI CRYPT_CreateBlob(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext) + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext) { DWORD size, i; CRYPT_BLOB_ARRAY *context; @@ -1086,7 +1086,7 @@ typedef BOOL (WINAPI *AddContextToStore)(HCERTSTORE hCertStore, const void *pContext, DWORD dwAddDisposition, const void **ppStoreContext); -static BOOL CRYPT_CreateContext(PCRYPT_BLOB_ARRAY pObject, +static BOOL CRYPT_CreateContext(const CRYPT_BLOB_ARRAY *pObject, DWORD dwExpectedContentTypeFlags, AddContextToStore addFunc, void **ppvContext) { BOOL ret = TRUE; @@ -1142,28 +1142,28 @@ } static BOOL WINAPI CRYPT_CreateCert(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext) + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext) { return CRYPT_CreateContext(pObject, CERT_QUERY_CONTENT_FLAG_CERT, (AddContextToStore)CertAddCertificateContextToStore, ppvContext); } static BOOL WINAPI CRYPT_CreateCRL(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext) + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext) { return CRYPT_CreateContext(pObject, CERT_QUERY_CONTENT_FLAG_CRL, (AddContextToStore)CertAddCRLContextToStore, ppvContext); } static BOOL WINAPI CRYPT_CreateCTL(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext) + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext) { return CRYPT_CreateContext(pObject, CERT_QUERY_CONTENT_FLAG_CTL, (AddContextToStore)CertAddCTLContextToStore, ppvContext); } static BOOL WINAPI CRYPT_CreatePKCS7(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext) + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext) { BOOL ret; @@ -1187,7 +1187,7 @@ } static BOOL WINAPI CRYPT_CreateAny(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext) + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext) { BOOL ret; @@ -1273,7 +1273,7 @@ } typedef BOOL (WINAPI *ContextDllCreateObjectContext)(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext); + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext); static BOOL CRYPT_GetCreateFunction(LPCSTR pszObjectOid, ContextDllCreateObjectContext *pFunc, HCRYPTOIDFUNCADDR *phFunc) @@ -1322,10 +1322,10 @@ return ret; } -typedef BOOL (*get_object_expiration_func)(void *pvContext, +typedef BOOL (*get_object_expiration_func)(const void *pvContext, FILETIME *expiration); -static BOOL CRYPT_GetExpirationFromCert(void *pvObject, FILETIME *expiration) +static BOOL CRYPT_GetExpirationFromCert(const void *pvObject, FILETIME *expiration) { PCCERT_CONTEXT cert = pvObject; @@ -1333,7 +1333,7 @@ return TRUE; } -static BOOL CRYPT_GetExpirationFromCRL(void *pvObject, FILETIME *expiration) +static BOOL CRYPT_GetExpirationFromCRL(const void *pvObject, FILETIME *expiration) { PCCRL_CONTEXT cert = pvObject; @@ -1341,7 +1341,7 @@ return TRUE; } -static BOOL CRYPT_GetExpirationFromCTL(void *pvObject, FILETIME *expiration) +static BOOL CRYPT_GetExpirationFromCTL(const void *pvObject, FILETIME *expiration) { PCCTL_CONTEXT cert = pvObject;

1 0

[cwittich] 42792: sync cryptdlg with wine 1.1.27
by cwittich＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: cwittich Date: Thu Aug 20 12:06:41 2009 New Revision: 42792 URL: http://svn.reactos.org/svn/reactos?rev=42792&view=rev Log: sync cryptdlg with wine 1.1.27 Added: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Pt.rc (with props) Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_De.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_En.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ko.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_Lt.rc Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc [iso-8859-1] Thu Aug 20 12:06:41 2009 @@ -28,4 +28,5 @@ #include "cryptdlg_Ko.rc" #include "cryptdlg_Lt.rc" #include "cryptdlg_Nl.rc" +#include "cryptdlg_Pt.rc" #include "cryptdlg_Ro.rc" Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_De.rc [iso-8859-1] Thu Aug 20 12:06:41 2009 @@ -20,6 +20,8 @@ #include "cryptres.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_En.rc [iso-8859-1] Thu Aug 20 12:06:41 2009 @@ -28,7 +28,7 @@ IDS_POLICY_ID "Policy Identifier: " IDS_POLICY_QUALIFIER_INFO "Policy Qualifier Info" IDS_POLICY_QUALIFIER_ID "Policy Qualifier Id=" - IDS_CPS "CPS" + IDS_CPS "CPS" /* Certification Practice Statement */ IDS_USER_NOTICE "User Notice" IDS_QUALIFIER "Qualifier" IDS_NOTICE_REF "Notice Reference" Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc [iso-8859-1] Thu Aug 20 12:06:41 2009 @@ -1,7 +1,8 @@ /* * cryptdlg dll French resources * - * Copyright 2008 JonathanÂ Ernst + * Copyright 2008 Jonathan Ernst + * Copyright 2009 FrÃ©dÃ©ric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,19 +21,23 @@ #include "cryptres.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { IDS_CERT_POLICY "Politique de certificat" IDS_POLICY_ID "Identifiant de politiqueÂ : " - IDS_POLICY_QUALIFIER_INFO "Policy Qualifier Info" - IDS_POLICY_QUALIFIER_ID "Policy Qualifier Id=" - IDS_CPS "CPS" - IDS_USER_NOTICE "User Notice" - IDS_QUALIFIER "Qualifier" - IDS_NOTICE_REF "Notice Reference" - IDS_ORGANIZATION "Organisation=" - IDS_NOTICE_NUM "Notice Number=" - IDS_NOTICE_TEXT "Notice Text=" + IDS_POLICY_QUALIFIER_INFO "Informations sur le qualificateur de politique" + IDS_POLICY_QUALIFIER_ID "Id de qualificateur de politique =" + IDS_CPS "ÃnoncÃ© des pratiques de certification (CPS)" + IDS_USER_NOTICE "Avis utilisateur" + IDS_QUALIFIER "Qualificateur" + IDS_NOTICE_REF "RÃ©fÃ©rence Ã l'avis" + IDS_ORGANIZATION "Organisation =" + IDS_NOTICE_NUM "NumÃ©ro de l'avis =" + IDS_NOTICE_TEXT "Texte de l'avis =" } +#pragma code_page(default) Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ko.rc [iso-8859-1] Thu Aug 20 12:06:41 2009 @@ -29,7 +29,7 @@ IDS_POLICY_ID "Á¤Ã¥ ½Äº°ÀÚ: " IDS_POLICY_QUALIFIER_INFO "Á¤Ã¥ ±¸º°ÀÚ Á¤º¸" IDS_POLICY_QUALIFIER_ID "Á¤Ã¥ ±¸º°ÀÚ ¾ÆÀÌµð=" - IDS_CPS "CPS" + IDS_CPS "CPS"/*ÀÎÁõ ½ÇÇö ¼±¾ð */ IDS_USER_NOTICE "»ç¿ëÀÚ ÅëÁö" IDS_QUALIFIER "±¸º°ÀÚ" IDS_NOTICE_REF "ÅëÁö ÂüÁ¶" Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Lt.rc [iso-8859-1] Thu Aug 20 12:06:41 2009 @@ -31,7 +31,7 @@ IDS_POLICY_ID "Politikos identifikatorius: " IDS_POLICY_QUALIFIER_INFO "Politikos kvalifikatoriaus informacija" IDS_POLICY_QUALIFIER_ID "Politikos kvalifikatoriaus identifikatorius=" - IDS_CPS "CPS" + IDS_CPS "Sertifikavimo Veiklos Nuostatos (CPS)" IDS_USER_NOTICE "Naudotojo praneÅ¡imas" IDS_QUALIFIER "Kvalifikatorius" IDS_NOTICE_REF "PraneÅ¡imo nuoroda" Added: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Pt.rc (added) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Pt.rc [iso-8859-1] Thu Aug 20 12:06:41 2009 @@ -1,0 +1,40 @@ +/* + * cryptdlg dll Portuguese resources + * + * Copyright 2008 Ricardo Filipe + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "cryptres.h" + +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE DISCARDABLE +{ + IDS_CERT_POLICY "PolÃtica de Certificados" + IDS_POLICY_ID "Identificador da PolÃtica: " + IDS_POLICY_QUALIFIER_INFO "InformaÃ§Ã£o do Qualificador da PolÃtica" + IDS_POLICY_QUALIFIER_ID "ID do Qualificador da PolÃtica=" + IDS_CPS "CPS" /* Certification Practice Statement */ + IDS_USER_NOTICE "Aviso ao Utilizador" + IDS_QUALIFIER "Qualificador" + IDS_NOTICE_REF "ReferÃªncia do Aviso" + IDS_ORGANIZATION "OrganizaÃ§Ã£o=" + IDS_NOTICE_NUM "NÃºmero do Aviso=" + IDS_NOTICE_TEXT "Texto do Aviso=" +} Propchange: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Pt.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs