Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 42070: - Prepare for importing a new winent driver and further work on win32k: add two header files: * ntrosgdi.h (should be renamed to rosgdi.h) - RosGdi* system calls. * rosuser.h - RosUser* system calls.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 21:52:36 2009 New Revision: 42070 URL: http://svn.reactos.org/svn/reactos?rev=42070&view=rev Log: - Prepare for importing a new winent driver and further work on win32k: add two header files: * ntrosgdi.h (should be renamed to rosgdi.h) - RosGdi* system calls. * rosuser.h - RosUser* system calls. Added: branches/arwinss/reactos/include/psdk/ntrosgdi.h (with props) Modified: branches/arwinss/reactos/include/reactos/win32k/rosuser.h Added: branches/arwinss/reactos/include/psdk/ntrosgdi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/nt… ============================================================================== --- branches/arwinss/reactos/include/psdk/ntrosgdi.h (added) +++ branches/arwinss/reactos/include/psdk/ntrosgdi.h [iso-8859-1] Sat Jul 18 21:52:36 2009 @@ -1,0 +1,171 @@ +/* + * NtRosGdi Entrypoints + */ +#ifndef _NTROSGDI_ +#define _NTROSGDI_ + +#ifndef W32KAPI +#define W32KAPI DECLSPEC_ADDRSAFE +#endif + +typedef struct _NTDRV_PDEVICE +{ + HDC hUserDC; + HDC hKernelDC; + int cache_index; /* cache of a currently selected font */ +} NTDRV_PDEVICE, *PNTDRV_PDEVICE; + +typedef struct _ROS_DCINFO +{ + WORD dwType; + SIZE szVportExt; + POINT ptVportOrg; + SIZE szWndExt; + POINT ptWndOrg; + XFORM xfWorld2Wnd; + XFORM xfWnd2Vport; +} ROS_DCINFO, *PROS_DCINFO; + +typedef struct +{ + LOGFONTW lf; + XFORM xform; + SIZE devsize; /* size in device coords */ + DWORD hash; +} LFANDSIZE; + +typedef enum { AA_None = 0, AA_Grey, AA_RGB, AA_BGR, AA_VRGB, AA_VBGR, AA_MAXVALUE } AA_Type; + +typedef struct +{ + int xOff; + int yOff; + int width; + int height; + int x; + int y; +} GlyphInfo; + +typedef struct +{ + //GlyphSet glyphset; + //XRenderPictFormat *font_format; + int nrealized; + BOOL *realized; + void **bitmaps; + GlyphInfo *gis; +} gsCacheEntryFormat; + +typedef struct +{ + LFANDSIZE lfsz; + AA_Type aa_default; + gsCacheEntryFormat * format[AA_MAXVALUE]; + INT count; + INT next; +} gsCacheEntry; + +/* bitmap.c */ + +BOOL APIENTRY RosGdiAlphaBlend(HDC devDst, INT xDst, INT yDst, INT widthDst, INT heightDst, + HDC devSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, + BLENDFUNCTION blendfn); +BOOL APIENTRY RosGdiBitBlt( HDC physDevDst, INT xDst, INT yDst, + INT width, INT height, HDC physDevSrc, + INT xSrc, INT ySrc, DWORD rop ); +BOOL APIENTRY RosGdiCreateBitmap( HDC physDev, HBITMAP hBitmap, BITMAP *pBitmap, LPVOID bmBits ); +HBITMAP APIENTRY RosGdiCreateDIBSection( HDC physDev, HBITMAP hbitmap, + const BITMAPINFO *bmi, UINT usage ); +BOOL APIENTRY RosGdiDeleteBitmap( HBITMAP hbitmap ); +LONG APIENTRY RosGdiGetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count ); +INT APIENTRY RosGdiGetDIBits( HDC physDev, HBITMAP hbitmap, UINT startscan, UINT lines, + LPVOID bits, BITMAPINFO *info, UINT coloruse ); +COLORREF APIENTRY RosGdiGetPixel( HDC physDev, INT x, INT y ); +BOOL APIENTRY RosGdiPatBlt( HDC physDev, INT left, INT top, INT width, INT height, DWORD rop ); +LONG APIENTRY RosGdiSetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count ); +UINT APIENTRY RosGdiSetDIBColorTable( HDC physDev, UINT start, UINT count, const RGBQUAD *colors ); +INT APIENTRY RosGdiSetDIBits( HDC physDev, HBITMAP hbitmap, UINT startscan, + UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ); +INT APIENTRY RosGdiSetDIBitsToDevice( HDC physDev, INT xDest, INT yDest, DWORD cx, + DWORD cy, INT xSrc, INT ySrc, + UINT startscan, UINT lines, LPCVOID bits, + const BITMAPINFO *info, UINT coloruse ); +BOOL APIENTRY RosGdiStretchBlt( HDC physDevDst, INT xDst, INT yDst, + INT widthDst, INT heightDst, + HDC physDevSrc, INT xSrc, INT ySrc, + INT widthSrc, INT heightSrc, DWORD rop ); + +/* dc.c */ +BOOL APIENTRY RosGdiCreateDC( PROS_DCINFO dc, HDC *pdev, LPCWSTR driver, LPCWSTR device, + LPCWSTR output, const DEVMODEW* initData ); +BOOL APIENTRY RosGdiDeleteDC( HDC physDev ); +BOOL APIENTRY RosGdiGetDCOrgEx( HDC physDev, LPPOINT lpp ); +BOOL APIENTRY RosGdiPaintRgn( HDC physDev, HRGN hrgn ); +VOID APIENTRY RosGdiSelectBitmap( HDC physDev, HBITMAP hbitmap ); +VOID APIENTRY RosGdiSelectBrush( HDC physDev, LOGBRUSH *pLogBrush ); +HFONT APIENTRY RosGdiSelectFont( HDC physDev, HFONT hfont, HANDLE gdiFont ); +VOID APIENTRY RosGdiSelectPen( HDC physDev, LOGPEN *pLogPen, EXTLOGPEN *pExtLogPen ); +COLORREF APIENTRY RosGdiSetBkColor( HDC physDev, COLORREF color ); +COLORREF APIENTRY RosGdiSetDCBrushColor( HDC physDev, COLORREF crColor ); +DWORD APIENTRY RosGdiSetDCOrg( HDC physDev, INT x, INT y ); +COLORREF APIENTRY RosGdiSetDCPenColor( HDC physDev, COLORREF crColor ); +void APIENTRY RosGdiSetDeviceClipping( HDC physDev, UINT count, PRECTL pRects, PRECTL rcBounds ); +BOOL APIENTRY RosGdiSetDeviceGammaRamp(HDC physDev, LPVOID ramp); +COLORREF APIENTRY RosGdiSetPixel( HDC physDev, INT x, INT y, COLORREF color ); +BOOL APIENTRY RosGdiSetPixelFormat(HDC physDev, + int iPixelFormat, + const PIXELFORMATDESCRIPTOR *ppfd); +COLORREF APIENTRY RosGdiSetTextColor( HDC physDev, COLORREF color ); +VOID APIENTRY RosGdiSetDcRect( HDC physDev, RECT *rcDcRect ); + +/* enum.c */ +int APIENTRY RosGdiChoosePixelFormat(HDC physDev, + const PIXELFORMATDESCRIPTOR *ppfd); +int APIENTRY RosGdiDescribePixelFormat(HDC physDev, + int iPixelFormat, + UINT nBytes, + PIXELFORMATDESCRIPTOR *ppfd); +BOOL APIENTRY RosGdiEnumDeviceFonts( HDC physDev, LPLOGFONTW plf, + FONTENUMPROCW proc, LPARAM lp ); +BOOL APIENTRY RosGdiGetCharWidth( HDC physDev, UINT firstChar, UINT lastChar, + LPINT buffer ); +INT APIENTRY RosGdiGetDeviceCaps( HDC physDev, INT cap ); +BOOL APIENTRY RosGdiGetDeviceGammaRamp(HDC physDev, LPVOID ramp); +BOOL APIENTRY RosGdiGetICMProfile( HDC physDev, LPDWORD size, LPWSTR filename ); +COLORREF APIENTRY RosGdiGetNearestColor( HDC physDev, COLORREF color ); +int APIENTRY RosGdiGetPixelFormat(HDC physDev); +UINT APIENTRY RosGdiGetSystemPaletteEntries( HDC physDev, UINT start, UINT count, + LPPALETTEENTRY entries ); +BOOL APIENTRY RosGdiGetTextExtentExPoint( HDC physDev, LPCWSTR str, INT count, + INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ); +BOOL APIENTRY RosGdiGetTextMetrics(HDC physDev, TEXTMETRICW *metrics); + +/* misc.c */ +BOOL APIENTRY RosGdiArc( HDC physDev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ); +BOOL APIENTRY RosGdiChord( HDC physDev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ); +BOOL APIENTRY RosGdiEllipse( HDC physDev, INT left, INT top, INT right, INT bottom ); +INT APIENTRY RosGdiExtEscape( HDC physDev, INT escape, INT in_count, LPCVOID in_data, + INT out_count, LPVOID out_data ); +BOOL APIENTRY RosGdiExtFloodFill( HDC physDev, INT x, INT y, COLORREF color, + UINT fillType ); +BOOL APIENTRY RosGdiExtTextOut( HDC physDev, INT x, INT y, UINT flags, + const RECT *lprect, LPCWSTR wstr, UINT count, + const INT *lpDx, gsCacheEntryFormat *formatEntry ); +BOOL APIENTRY RosGdiLineTo( HDC physDev, INT x1, INT y1, INT x2, INT y2 ); +BOOL APIENTRY RosGdiPie( HDC physDev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ); +BOOL APIENTRY RosGdiPolyPolygon( HDC physDev, const POINT* pt, const INT* counts, UINT polygons); +BOOL APIENTRY RosGdiPolyPolyline( HDC physDev, const POINT* pt, const DWORD* counts, DWORD polylines ); +BOOL APIENTRY RosGdiPolygon( HDC physDev, const POINT* pt, INT count ); +BOOL APIENTRY RosGdiPolyline( HDC physDev, const POINT* pt, INT count ); +UINT APIENTRY RosGdiRealizeDefaultPalette( HDC physDev ); +UINT APIENTRY RosGdiRealizePalette( HDC physDev, HPALETTE hpal, BOOL primary ); +BOOL APIENTRY RosGdiRectangle(HDC physDev, PRECT rc); +BOOL APIENTRY RosGdiRoundRect( HDC physDev, INT left, INT top, INT right, + INT bottom, INT ell_width, INT ell_height ); +BOOL APIENTRY RosGdiSwapBuffers(HDC physDev); +BOOL APIENTRY RosGdiUnrealizePalette( HPALETTE hpal ); + +#endif Propchange: branches/arwinss/reactos/include/psdk/ntrosgdi.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/include/reactos/win32k/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] Sat Jul 18 21:52:36 2009 @@ -1,0 +1,43 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Win32 Graphical Subsystem (WIN32K) + * FILE: include/win32k/rosuser.h + * PURPOSE: Win32 Shared USER Types for RosUser* + * PROGRAMMER: Aleksey Bragin <aleksey(a)reactos.org> + */ + +/* INCLUDES ******************************************************************/ + +#ifndef __WIN32K_ROSUSER_H +#define __WIN32K_ROSUSER_H + +/* DEFINES *******************************************************************/ + +/* ENUMERATIONS **************************************************************/ + +/* TYPES *********************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +#if 0 +BOOL +NTAPI +RosUserEnumDisplayMonitors( + HDC hdc, + LPRECT rect, + MONITORENUMPROC proc, + LPARAM lp +); + +BOOL +NTAPI +RosUserGetMonitorInfo( + HMONITOR handle, + LPMONITORINFO info +); +#endif + +VOID NTAPI +RosUserConnectCsrss(); + +#endif /* __WIN32K_NTUSER_H */

1 0

[dreimer] 42069: Sync to winfile to Wine 1.1.26
by dreimer＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: dreimer Date: Sat Jul 18 21:48:17 2009 New Revision: 42069 URL: http://svn.reactos.org/svn/reactos?rev=42069&view=rev Log: Sync to winfile to Wine 1.1.26 Added: trunk/rosapps/applications/winfile/lang/bg-BG.rc (with props) trunk/rosapps/applications/winfile/lang/fi-FI.rc (with props) trunk/rosapps/applications/winfile/lang/lt-LT.rc (with props) trunk/rosapps/applications/winfile/lang/rm-CH.rc (with props) trunk/rosapps/applications/winfile/lang/ro-RO.rc (with props) trunk/rosapps/applications/winfile/lang/sk-SK.rc (with props) Modified: trunk/rosapps/applications/winfile/lang/de-DE.rc trunk/rosapps/applications/winfile/lang/fr-FR.rc trunk/rosapps/applications/winfile/lang/ja-JP.rc trunk/rosapps/applications/winfile/lang/pt-BR.rc trunk/rosapps/applications/winfile/lang/sl-SI.rc trunk/rosapps/applications/winfile/lang/zh-CN.rc trunk/rosapps/applications/winfile/resource.h trunk/rosapps/applications/winfile/rsrc.rc Added: trunk/rosapps/applications/winfile/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/bg-BG.rc (added) +++ trunk/rosapps/applications/winfile/lang/bg-BG.rc [iso-8859-1] Sat Jul 18 21:48:17 2009 @@ -1,0 +1,85 @@ +/* + * Help Viewer Bulgarian resource + * + * Copyright 2005 Milko Krachounov + * + * 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 + */ + +/* Menu */ + +MAIN_MENU MENU LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT +{ + POPUP "&Ôàéë" { + MENUITEM "&Îòâîðè", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "&Ïå÷àò", MNID_FILE_PRINT + MENUITEM "&Íàñòðîéêà íà ïðèíòåðà...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "&Èçõîä", MNID_FILE_EXIT + } + POPUP "&Ðåäàêòèðàíå" { + MENUITEM "&Êîïèðàé...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "&Àíîòèðàé...", MNID_EDIT_ANNOTATE + } + POPUP "&Îòìåòêè" { + MENUITEM "&Çàäàé...", MNID_BKMK_DEFINE + } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } + POPUP "&Ïîìîù" { + MENUITEM "Ïîìîù &çà ïîìîùòà", MNID_HELP_HELPON + MENUITEM "Âèíàãè îò&ãîðå", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "&Èíôîðìàöèÿ...", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "&Îòíîñíî WINE", MNID_HELP_WINE +#endif + } +} + +/* Strings */ +STRINGTABLE DISCARDABLE LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT +{ +STID_WINE_HELP, "WINE Ïîìîù" +STID_WHERROR, "ÃÐÅØÊÀ" +STID_WARNING, "ÏÐÅÄÓÏÐÅÆÄÅÍÈÅ" +STID_INFO, "Èíôîðìàöèÿ" +STID_NOT_IMPLEMENTED, "Íå å ðåàëèçèðàíî" +STID_HLPFILE_ERROR_s, "Ãðåøêà ïðè ÷åòåíå íà ïîìîùíèÿ ôàéë `%s'" +STID_INDEX, "&Ñúäúðæàíèå" +STID_CONTENTS, "Summary" +STID_BACK, "&Íàçàä" +STID_ALL_FILES, "Âñè÷êè ôàéëîâå (*.*)" +STID_HELP_FILES_HLP, "Ïîìîùíè ôàéëîâå (*.hlp)" +STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" +STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_PSH_INDEX, "Help topics: " +} Propchange: trunk/rosapps/applications/winfile/lang/bg-BG.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/winfile/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/lang/de-DE.rc [iso-8859-1] Sat Jul 18 21:48:17 2009 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Winefile * German Language Support * @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL /* Menu */ @@ -28,33 +30,33 @@ IDM_WINEFILE MENU FIXED IMPURE { POPUP "&Datei" { - MENUITEM "Ö&ffnen\tEingabetaste", ID_ACTIVATE + MENUITEM "Ã&ffnen\tEingabetaste", ID_ACTIVATE MENUITEM "&Verschieben...\tF7", ID_FILE_MOVE MENUITEM "&Kopieren...\tF8", ID_FILE_COPY MENUITEM "&In Zwischenablage...\tF9", 118 - MENUITEM "&Löschen\tEntf", ID_FILE_DELETE + MENUITEM "&LÃ¶schen\tEntf", ID_FILE_DELETE MENUITEM "&Umbenennen...", 109 MENUITEM "&Eigenschaften...\tAlt+Eingabetaste", ID_EDIT_PROPERTIES MENUITEM SEPARATOR MENUITEM "K&omprimieren...", 119 MENUITEM "Deko&mprimieren...", 120 MENUITEM SEPARATOR - MENUITEM "&Ausführen...", ID_EXECUTE + MENUITEM "&AusfÃ¼hren...", ID_EXECUTE MENUITEM "&Drucken...", 102 MENUITEM "Zuord&nen...", 103 MENUITEM SEPARATOR MENUITEM "Ver&zeichnis erstellen...", 111 MENUITEM "&Suchen...", 104 - MENUITEM "Dateien aus&wählen...", 116 + MENUITEM "Dateien aus&wÃ¤hlen...", 116 MENUITEM SEPARATOR MENUITEM "&Beenden\tAlt+X", ID_FILE_EXIT } - POPUP "Da&tenträger" { - MENUITEM "Datenträger &kopieren...", 201 - MENUITEM "Datenträger &benennen...", 202 - MENUITEM SEPARATOR - MENUITEM "Datenträger &formatieren...", ID_FORMAT_DISK + POPUP "Da&tentrÃ¤ger" { + MENUITEM "DatentrÃ¤ger &kopieren...", 201 + MENUITEM "DatentrÃ¤ger &benennen...", 202 + MENUITEM SEPARATOR + MENUITEM "DatentrÃ¤ger &formatieren...", ID_FORMAT_DISK #ifdef _WIN95 MENUITEM "...", -1 /*TODO*/ #endif @@ -65,12 +67,12 @@ MENUITEM "F&reigeben als...", 254 MENUITEM "Freigabe been&den...", 255 MENUITEM SEPARATOR - MENUITEM "Laufwerk aus&wählen...", 251 + MENUITEM "Laufwerk aus&wÃ¤hlen...", 251 } POPUP "&Verzeichnisse" { - MENUITEM "&Nächste Ebene einblenden\t+",301 + MENUITEM "&NÃ¤chste Ebene einblenden\t+",301 MENUITEM "&Zweig einblenden\t*", 302 MENUITEM "Alle &Ebenen einblenden\tStrg+*",303 MENUITEM "Zweig &ausblenden\t-", 304 @@ -91,14 +93,14 @@ MENUITEM SEPARATOR MENUITEM "Nach N&ame", ID_VIEW_SORT_NAME MENUITEM "Nach T&yp", ID_VIEW_SORT_TYPE - MENUITEM "Nach &Größe", ID_VIEW_SORT_SIZE + MENUITEM "Nach &GrÃ¶Ãe", ID_VIEW_SORT_SIZE MENUITEM "Nach &Datum", ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Angaben ausw&ählen...", ID_VIEW_FILTER + MENUITEM "Angaben ausw&Ã¤hlen...", ID_VIEW_FILTER } POPUP "&Optionen" { - MENUITEM "&Bestätigen...", 501 + MENUITEM "&BestÃ¤tigen...", 501 MENUITEM "Schrift&art...", ID_SELECT_FONT MENUITEM "Symbolleiste &definieren...", 512 MENUITEM SEPARATOR @@ -115,13 +117,13 @@ POPUP "&Sicherheit" { MENUITEM "&Berechtigungen...", 605 - MENUITEM "Über&wachen...", 606 + MENUITEM "Ãber&wachen...", 606 MENUITEM "Besi&tzer...", 607 } POPUP "&Fenster" { MENUITEM "Neues &Fenster", ID_WINDOW_NEW - MENUITEM "Über&lappend\tUmschalt+F5", ID_WINDOW_CASCADE + MENUITEM "Ãber&lappend\tUmschalt+F5", ID_WINDOW_CASCADE MENUITEM "&Untereinander", ID_WINDOW_TILE_HORZ MENUITEM "&Nebeneinander\tUmschalt+F4", ID_WINDOW_TILE_VERT #ifndef _NO_EXTENSIONS @@ -136,14 +138,14 @@ MENUITEM "&Suchen...\tF1", ID_HELP MENUITEM "Hilfe &verwenden\tF1", ID_HELP_USING MENUITEM SEPARATOR - MENUITEM "&Info über Winefile...", ID_ABOUT + MENUITEM "&Info Ã¼ber Winefile...", ID_ABOUT } } IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ausführen" +CAPTION "AusfÃ¼hren" FONT 8, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 @@ -157,7 +159,7 @@ IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ziel auswählen" +CAPTION "Ziel auswÃ¤hlen" FONT 8, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 @@ -170,7 +172,7 @@ IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Angaben auswählen" +CAPTION "Angaben auswÃ¤hlen" FONT 8, "MS Sans Serif" BEGIN LTEXT "&Name:",-1,7,8,22,10 @@ -192,7 +194,7 @@ IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Eigenschaften für %s" +CAPTION "Eigenschaften fÃ¼r %s" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 @@ -201,16 +203,16 @@ EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "&Pfad:",-1,7,18,59,9 EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Letzte &Änderung:",-1,7,29,59,9 + LTEXT "Letzte &Ãnderung:",-1,7,29,59,9 EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "&Version:",-1,7,40,59,9 EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "&Copyright:",-1,7,51,59,9 EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "&Größe:",-1,7,62,59,9 + LTEXT "&GrÃ¶Ãe:",-1,7,62,59,9 EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP GROUPBOX "Attribute",-1,7,79,158,46 - CONTROL "&Schreibgeschützt",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "&SchreibgeschÃ¼tzt",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 CONTROL "&Versteckt",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 CONTROL "&Archiv",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 CONTROL "Sys&tem",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 @@ -224,7 +226,7 @@ STRINGTABLE { IDS_FONT_SEL_DLG_NAME "Anwenden der Schriftarteinstellung" - IDS_FONT_SEL_ERROR "Fehler während der Schriftart-Auswahl." + IDS_FONT_SEL_ERROR "Fehler wÃ¤hrend der Schriftart-Auswahl." } STRINGTABLE @@ -243,10 +245,10 @@ STRINGTABLE { IDS_COL_NAME "Name" - IDS_COL_SIZE "Größe" + IDS_COL_SIZE "GrÃ¶Ãe" IDS_COL_CDATE "CDatum" IDS_COL_ADATE "ZDatum" - IDS_COL_MDATE "ÄDatum" + IDS_COL_MDATE "ÃDatum" IDS_COL_IDX "Index/Inode" IDS_COL_LINKS "Links" IDS_COL_ATTR "Attribute" Added: trunk/rosapps/applications/winfile/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/fi-FI.rc (added) +++ trunk/rosapps/applications/winfile/lang/fi-FI.rc [iso-8859-1] Sat Jul 18 21:48:17 2009 @@ -1,0 +1,88 @@ +/* + * Help Viewer + * + * Copyright 1996 Ulrich Schmid + * Finnish language by Jussi Tirkkonen <jt(a)modeemi.cs.tut.fi> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * + * 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 + */ + +/* Menu */ + +MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT +{ + POPUP "&Tiedosto" { + MENUITEM "&Avaa...", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "&Tulosta", MNID_FILE_PRINT + MENUITEM "&Kirjoittimen asetukset...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "&Lopeta", MNID_FILE_EXIT + } + POPUP "&Muokkaa" { + MENUITEM "&Kopioi...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "&Huomautus...", MNID_EDIT_ANNOTATE + } + POPUP "&Kirjanmerkki" { + MENUITEM "&Aseta...", MNID_BKMK_DEFINE + } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } + POPUP "&Ohje" { + MENUITEM "&Ohjeen käyttö", MNID_HELP_HELPON + MENUITEM "&Aina päällimmäisenä", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "T&ietoja...", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "&Tietoja WINEstä", MNID_HELP_WINE +#endif + } +} + +/* Strings */ + +STRINGTABLE DISCARDABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT +{ +STID_WINE_HELP, "WINE Ohje" +STID_WHERROR, "VIRHE" +STID_WARNING, "VAROITUS" +STID_INFO, "Tietoja" +STID_NOT_IMPLEMENTED, "Ei käytettävissä" +STID_HLPFILE_ERROR_s, "Virhe luettaessa ohjetiedostoa `%s'" +STID_INDEX, "&Sisällys" +STID_CONTENTS, "Summary" +STID_BACK, "&Takaisin" +STID_ALL_FILES, "Kaikki tiedostot (*.*)" +STID_HELP_FILES_HLP, "Ohjetiedostot (*.hlp)" +STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" +STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_PSH_INDEX, "Help topics: " +} Propchange: trunk/rosapps/applications/winfile/lang/fi-FI.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/winfile/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/lang/fr-FR.rc [iso-8859-1] Sat Jul 18 21:48:17 2009 @@ -1,4 +1,4 @@ -/* +ï»¿/* * WineFile * French Language Support * @@ -23,6 +23,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL /* Menu */ @@ -30,24 +33,24 @@ IDM_WINEFILE MENU FIXED IMPURE { POPUP "&Fichier" { - MENUITEM "&Ouvrir\tEntrée", ID_ACTIVATE - MENUITEM "&Déplacer...\tF7", ID_FILE_MOVE + MENUITEM "&Ouvrir\tEntrÃ©e", ID_ACTIVATE + MENUITEM "&DÃ©placer...\tF7", ID_FILE_MOVE MENUITEM "&Copier...\tF8", ID_FILE_COPY MENUITEM "P&resse-papiers...\tF9", 118 MENUITEM "&Effacer\tSuppr", ID_FILE_DELETE MENUITEM "Re&nommer...", 109 - MENUITEM "&Propriétés...\tAlt+Entree", ID_EDIT_PROPERTIES + MENUITEM "&PropriÃ©tÃ©s...\tAlt+EntrÃ©e", ID_EDIT_PROPERTIES MENUITEM SEPARATOR MENUITEM "Co&mpresser...", 119 - MENUITEM "Décompre&sser...", 120 - MENUITEM SEPARATOR - MENUITEM "E&xécuter...", ID_EXECUTE + MENUITEM "DÃ©compre&sser...", 120 + MENUITEM SEPARATOR + MENUITEM "E&xÃ©cuter...", ID_EXECUTE MENUITEM "&Imprimer...", 102 MENUITEM "&Associer...", 103 MENUITEM SEPARATOR - MENUITEM "Créer Réper&toire...", 111 + MENUITEM "CrÃ©er rÃ©per&toire...", 111 MENUITEM "Rec&hercher...", 104 - MENUITEM "Sélectionner &Fichiers...", 116 + MENUITEM "SÃ©lectionner &fichiers...", 116 MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS MENUITEM "&Quitter\tAlt+X", ID_FILE_EXIT @@ -57,16 +60,16 @@ } POPUP "&Disque" { - MENUITEM "&Copier Disque...", 201 - MENUITEM "&Nommer Disque...", 202 - MENUITEM SEPARATOR - MENUITEM "&Formater Disque...", ID_FORMAT_DISK + MENUITEM "&Copier disque...", 201 + MENUITEM "&Nommer disque...", 202 + MENUITEM SEPARATOR + MENUITEM "&Formater disque...", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "Créer un disque &système...", -1 /*TODO*/ -#endif - MENUITEM SEPARATOR - MENUITEM "Connecter un lecteur &réseau",ID_CONNECT_NETWORK_DRIVE - MENUITEM "&Déconnecter un lecteur réseau",ID_DISCONNECT_NETWORK_DRIVE + MENUITEM "CrÃ©er un disque &systÃ¨me...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "Connecter un lecteur &rÃ©seau",ID_CONNECT_NETWORK_DRIVE + MENUITEM "&DÃ©connecter un lecteur rÃ©seau",ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "&Partager...", 254 MENUITEM "Cesser de parta&ger", 255 @@ -74,66 +77,66 @@ MENUITEM "Choisir le &lecteur", 251 } - POPUP "&Répertoires" { - MENUITEM "&Développer un niveau\t+", 301 - MENUITEM "Développer une &branche\t*", 302 - MENUITEM "&Tout développer\tCtrl+*", 303 - MENUITEM "&Réduire une branche\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&Indiquer l'arborescence", 505 - } - - POPUP "&Vue" { - MENUITEM "Arbre et ré&pertoire", 413 + POPUP "&RÃ©pertoires" { + MENUITEM "&DÃ©velopper un niveau\t+", 301 + MENUITEM "DÃ©velopper une &branche\t*", 302 + MENUITEM "&Tout dÃ©velopper\tCtrl+*", 303 + MENUITEM "&RÃ©duire une branche\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&Marquer l'arborescence", 505 + } + + POPUP "&Affichage" { + MENUITEM "Ar&bre et rÃ©pertoire", 413 MENUITEM "&Arbre seulement", 411 - MENUITEM "&Répertoire seulement", 412 - MENUITEM SEPARATOR - MENUITEM "&Séparer", ID_VIEW_SPLIT + MENUITEM "&RÃ©pertoire seulement", 412 + MENUITEM SEPARATOR + MENUITEM "&SÃ©parer", ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Nom", ID_VIEW_NAME - MENUITEM "Tous &les Détails", ID_VIEW_ALL_ATTRIBUTES, CHECKED - MENUITEM "&Détails...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "Trier par N&om", ID_VIEW_SORT_NAME - MENUITEM "Trier par &Type", ID_VIEW_SORT_TYPE - MENUITEM "Trier par Ta&ille", ID_VIEW_SORT_SIZE - MENUITEM "Trier par Dat&e", ID_VIEW_SORT_DATE - MENUITEM SEPARATOR - MENUITEM "Trier par &...", ID_VIEW_FILTER + MENUITEM "Tous &les dÃ©tails", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "&DÃ©tails...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "Trier par n&om", ID_VIEW_SORT_NAME + MENUITEM "Trier par &type", ID_VIEW_SORT_TYPE + MENUITEM "Trier par ta&ille", ID_VIEW_SORT_SIZE + MENUITEM "Trier par dat&e", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "Trier &par...", ID_VIEW_FILTER } POPUP "&Options" { MENUITEM "&Confirmation...", 501 MENUITEM "&Police...", ID_SELECT_FONT - MENUITEM "Personnaliser la &barre d'Outils...", 512 - MENUITEM SEPARATOR - MENUITEM "Barre d'&Outils", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "Barre de &Lecteur", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "Barre d'&État", ID_VIEW_STATUSBAR, CHECKED + MENUITEM "Personnaliser la &barre d'outils...", 512 + MENUITEM SEPARATOR + MENUITEM "Barre d'&outils", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "Barre de &lecteur", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "Barre d'&Ã©tat", ID_VIEW_STATUSBAR, CHECKED #ifndef _NO_EXTENSIONS - MENUITEM "P&lein Écran\tCtrl+Shift+S", ID_VIEW_FULLSCREEN -#endif - MENUITEM SEPARATOR - MENUITEM "&Réduire a l'utilisation", 504 + MENUITEM "P&lein Ã©cran\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "&RÃ©duire Ã l'utilisation", 504 MENUITEM "&Enregistrer la configuration en quittant",511 } - POPUP "&Sécurité" { - MENUITEM "&Accès...", 605 - MENUITEM "&Surveillance...", 606 - MENUITEM "&Propriétaire...", 607 - } - - POPUP "&Fenêtre" { - MENUITEM "Nouvelle &fenêtre", ID_WINDOW_NEW + POPUP "&SÃ©curitÃ©" { + MENUITEM "&AccÃ¨s...", 605 + MENUITEM "&Journalisation...", 606 + MENUITEM "&PropriÃ©taire...", 607 + } + + POPUP "Fe&nÃªtre" { + MENUITEM "Nouvelle &fenÃªtre", ID_WINDOW_NEW MENUITEM "&En cascade\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Mosaïque &horizontale", ID_WINDOW_TILE_HORZ - MENUITEM "Mosaïque &verticale\tCtrl+F4",ID_WINDOW_TILE_VERT + MENUITEM "MosaÃ¯que &horizontale", ID_WINDOW_TILE_HORZ + MENUITEM "MosaÃ¯que &verticale\tCtrl+F4",ID_WINDOW_TILE_VERT #ifndef _NO_EXTENSIONS - MENUITEM "Réorganisation &Automatique", ID_WINDOW_AUTOSORT -#endif - MENUITEM "Réorganiser les &icônes", ID_WINDOW_ARRANGE + MENUITEM "RÃ©organisation aut&omatique", ID_WINDOW_AUTOSORT +#endif + MENUITEM "RÃ©organiser les &icÃ´nes", ID_WINDOW_ARRANGE MENUITEM "&Actualiser\tF5", ID_REFRESH } @@ -142,20 +145,20 @@ MENUITEM "&Rechercher dans l'aide\tF1", ID_HELP MENUITEM "&Utiliser l'aide\tF1", ID_HELP_USING MENUITEM SEPARATOR - MENUITEM "À &propos de Winefile", ID_ABOUT + MENUITEM "Ã &propos de Winefile", ID_ABOUT } } IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Exécuter" +CAPTION "ExÃ©cuter" FONT 8, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Commande :", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "&CommandeÂ :", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Sous forme d'icône", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + CONTROL "Sous forme d'icÃ´ne", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 75, 12 DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 PUSHBUTTON "Annuler", 2, 158, 23, 47, 14 PUSHBUTTON "Aid&e", 254, 158, 43, 47, 14 @@ -163,65 +166,65 @@ IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Sélectionner la destination" +CAPTION "SÃ©lectionner la destination" FONT 8, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Chemin :", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "&CheminÂ :", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 PUSHBUTTON "Annuler", 2, 158, 23, 47, 14 PUSHBUTTON "&Parcourir...", 254, 158, 43, 47, 14 } -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Par type de fichier" FONT 8, "MS Sans Serif" BEGIN - LTEXT "&Nom :",-1,7,8,22,10 + LTEXT "&NomÂ :",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL - GROUPBOX "Type de fichier",-1,7,23,87,56 - CONTROL "&Répertoires",IDC_VIEW_TYPE_DIRECTORIES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + GROUPBOX "Type de fichier ",-1,7,23,87,59 + CONTROL "&RÃ©pertoires",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,34,70,10 CONTROL "&Programmes",IDC_VIEW_TYPE_PROGRAMS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + BS_AUTOCHECKBOX | WS_TABSTOP,13,45,70,10 CONTROL "Docu&ments",IDC_VIEW_TYPE_DOCUMENTS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + BS_AUTOCHECKBOX | WS_TABSTOP,13,56,70,10 CONTROL "&Autres fichiers",IDC_VIEW_TYPE_OTHERS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 - CONTROL "Montrer les fichiers cachés/&système",IDC_VIEW_TYPE_HIDDEN, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + BS_AUTOCHECKBOX | WS_TABSTOP,13,67,70,10 + CONTROL "Montrer les fichiers cachÃ©s/&systÃ¨me",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,86,130,9 DEFPUSHBUTTON "OK",IDOK,104,7,50,14 PUSHBUTTON "Annuler",IDCANCEL,104,24,50,14 END IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Propriétés de %s" +CAPTION "PropriÃ©tÃ©s de %s" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 - PUSHBUTTON "Annuler",IDCANCEL,191,29,50,14 - LTEXT "Nom du &fichier :",-1,7,7,59,9 + PUSHBUTTON "Annuler",IDCANCEL,191,25,50,14 + LTEXT "Nom du &fichierÂ :",-1,7,7,59,9 EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Chemin com&plet :",-1,7,18,59,9 + LTEXT "Chemin com&pletÂ :",-1,7,18,59,9 EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Modification :",-1,7,29,59,9 + LTEXT "ModificationÂ :",-1,7,29,59,9 EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Version :",-1,7,40,59,9 + LTEXT "VersionÂ :",-1,7,40,59,9 EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Cop&yright :",-1,7,51,59,9 + LTEXT "Cop&yrightÂ :",-1,7,51,59,9 EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Taille :",-1,7,62,59,9 + LTEXT "TailleÂ :",-1,7,62,59,9 EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP GROUPBOX "Attributs",-1,7,79,158,46 CONTROL "Lectu&re seule",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 - CONTROL "Cac&hé",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "Cac&hÃ©",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 CONTROL "&Archive",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 - CONTROL "&Système",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 - CONTROL "&Compressé",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 - GROUPBOX "&Version Information",-1,7,129,234,79 + CONTROL "&SystÃ¨me",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "&CompressÃ©",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&Informations de version",-1,7,129,234,79 LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL END @@ -229,8 +232,8 @@ STRINGTABLE { - IDS_FONT_SEL_DLG_NAME "Appliquer les réglages des fontes" - IDS_FONT_SEL_ERROR "Erreur dans la sélection de la nouvelle fonte." + IDS_FONT_SEL_DLG_NAME "Application des rÃ©glages des polices" + IDS_FONT_SEL_ERROR "Erreur lors de la sÃ©lection de la nouvelle police." } STRINGTABLE @@ -242,7 +245,7 @@ IDS_DESKTOP "Bureau" IDS_SHELL "Shell" IDS_TITLEFMT "%s - %s" - IDS_NO_IMPL "Pas encore implémenté" + IDS_NO_IMPL "Pas encore implÃ©mentÃ©" IDS_WINE_FILE "Wine File" } @@ -250,13 +253,13 @@ { IDS_COL_NAME "Nom" IDS_COL_SIZE "Taille" - IDS_COL_CDATE "CDate" - IDS_COL_ADATE "ADate" - IDS_COL_MDATE "MDate" + IDS_COL_CDATE "Dernier changement de statut (ctime)" + IDS_COL_ADATE "Dernier accÃ¨s" + IDS_COL_MDATE "DerniÃ¨re modification" IDS_COL_IDX "Index/Inode" IDS_COL_LINKS "Liens" IDS_COL_ATTR "Attributs" - IDS_COL_SEC "Sécurité" + IDS_COL_SEC "SÃ©curitÃ©" IDS_FREE_SPACE_FMT "%s sur %s libre" } Modified: trunk/rosapps/applications/winfile/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/lang/ja-JP.rc [iso-8859-1] Sat Jul 18 21:48:17 2009 @@ -1,4 +1,4 @@ -/* +ï»¿/* * WineFile * Japanese Language Support * @@ -261,5 +261,3 @@ IDS_FREE_SPACE_FMT "%s of %s free" } - -#pragma code_page(default) Added: trunk/rosapps/applications/winfile/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/lt-LT.rc (added) +++ trunk/rosapps/applications/winfile/lang/lt-LT.rc [iso-8859-1] Sat Jul 18 21:48:17 2009 @@ -1,0 +1,261 @@ +ï»¿/* + * WineFile + * Lithuanian Language Support + * + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +/* Menu */ + +IDM_WINEFILE MENU FIXED IMPURE +{ + POPUP "&Failas" { + MENUITEM "&Atverti\tEnter", ID_ACTIVATE + MENUITEM "Pe&rkelti...\tF7", ID_FILE_MOVE + MENUITEM "&Kopijuoti...\tF8", ID_FILE_COPY + MENUITEM "IÅ¡karpin&Äje...\tF9", 118 + MENUITEM "&Å alinti\tDel", ID_FILE_DELETE + MENUITEM "Per&vadinti...", 109 + MENUITEM "Savy&bÄs...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "&Glaudinti...", 119 + MENUITEM "IÅ¡sk&leisti...", 120 + MENUITEM SEPARATOR + MENUITEM "&Vykdyti...", ID_EXECUTE + MENUITEM "&Spausdinti...", 102 + MENUITEM "Susieti...", 103 + MENUITEM SEPARATOR + MENUITEM "Suk&urti katalogÄ...", 111 + MENUITEM "&IeÅ¡koti...", 104 + MENUITEM "&PaÅ¾ymÄti failus...", 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "IÅ¡&eiti\tAlt+X", ID_FILE_EXIT +#else + MENUITEM "IÅ¡&eiti", ID_FILE_EXIT +#endif + } + + POPUP "&Diskas" { + MENUITEM "&Kopijuoti diskÄ...", 201 + MENUITEM "&Pavadinti diskÄ...", 202 + MENUITEM SEPARATOR + MENUITEM "&Å½enklinti diskÄ...", ID_FORMAT_DISK +#ifdef _WIN95 + MENUITEM "&Sukurti sisteminÄ¯ diskÄ...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "Pri&jungti tinklo diskÄ", ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Atjungti tinklo diskÄ", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "&Bendrinti kaip...", 254 + MENUITEM "&Panaikinti bendrumÄ...", 255 + MENUITEM SEPARATOR + MENUITEM "&IÅ¡rinkti diskÄ...", 251 + } + + POPUP "&Katalogai" { + MENUITEM "&Kitas lygis\t+", 301 + MENUITEM "IÅ¡skleisti &medÄ¯\t*", 302 + MENUITEM "IÅ¡skleisti &viskÄ\tStrg+*", 303 + MENUITEM "Suskleisti m&edÄ¯\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&PaÅ¾ymÄti vaikus", 505 + } + + POPUP "&Rodymas" { + MENUITEM "&Medis ir katalogai", 413 + MENUITEM "&Tik medis", 411 + MENUITEM "Tik &katalogai", 412 + MENUITEM SEPARATOR + MENUITEM "&Skaidyti", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "&Vardas", ID_VIEW_NAME + MENUITEM "Visa failo &informacija", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "&DalinÄ informacija...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&Rikiuoti pagal vardÄ", ID_VIEW_SORT_NAME + MENUITEM "Rikiuoti &pagal tipÄ", ID_VIEW_SORT_TYPE + MENUITEM "Rikiuoti pagal d&ydÄ¯", ID_VIEW_SORT_SIZE + MENUITEM "Rikiuoti pagal d&atÄ", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "&Filtruoti pagal...", ID_VIEW_FILTER + } + + POPUP "&Parinktys" { + MENUITEM "&Patvirtinimas...", 501 + MENUITEM "&Å riftas...", ID_SELECT_FONT + MENUITEM "Adaptuoti Ä¯rankiÅ³ &juostÄ...", 512 + MENUITEM SEPARATOR + MENUITEM "&Ä®rankiÅ³ juosta", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "&DiskÅ³ juosta", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&BÅ«senos juosta", ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "&Visas ekranas\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "&Suskleisti vykdant", 504 + MENUITEM "&IÅ¡einant iÅ¡saugoti nuostatas", ID_VIEW_SAVESETTINGS + } + + + POPUP "&Saugumas" { + MENUITEM "&Prieiga...", 605 + MENUITEM "&Registravimas...", 606 + MENUITEM "&Savininkas...", 607 + } + + POPUP "&Langas" { + MENUITEM "Naujas &langas", ID_WINDOW_NEW + MENUITEM "IÅ¡dÄstyti pa&kopomis\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "IÅ¡kloti &gulsÄiai", ID_WINDOW_TILE_HORZ + MENUITEM "IÅ¡kloti &staÄiai\tCtrl+F4", ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "IÅ¡dÄstyti &automatiÅ¡kai", ID_WINDOW_AUTOSORT +#endif + MENUITEM "IÅ¡dÄstyti si&mbolius", ID_WINDOW_ARRANGE + MENUITEM "At&naujinti\tF5", ID_REFRESH + } + + POPUP "&Å½inynas" { + MENUITEM "Å½inyno &temos\tF1", ID_HELP + MENUITEM "&PaieÅ¡ka Å¾inyne...\tF1", ID_HELP + MENUITEM "Å½inyno &naudojimas\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "&Apie Winefile...", ID_ABOUT + } +} + + +IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Vykdyti" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Komanda:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + CONTROL "Kaip &simbolÄ¯", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "Gerai", 1, 158, 6, 47, 14 + PUSHBUTTON "Atsisakyti", 2, 158, 23, 47, 14 + PUSHBUTTON "&Å½inynas", 254, 158, 43, 47, 14 +} + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IÅ¡rinkite paskirtÄ¯" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Kelias:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "Gerai", 1, 158, 6, 47, 14 + PUSHBUTTON "Atsisakyti", 2, 158, 23, 47, 14 + PUSHBUTTON "&Parinkti", 254, 158, 43, 47, 14 +} + +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Pagal failo tipÄ" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Vardas:",-1,7,8,26,10 + EDITTEXT IDC_VIEW_PATTERN,35,7,59,12,ES_AUTOHSCROLL + GROUPBOX "FailÅ³ tipai",-1,7,23,87,56 + CONTROL "&Katalogai",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Programos",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "&Dokumentai",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "Kiti &failai",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "Rodyti paslÄptus/&sisteminius failus",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,122,9 + DEFPUSHBUTTON "Gerai",IDOK,104,7,50,14 + PUSHBUTTON "Atsisakyti",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "%s savybÄs" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "Gerai",IDOK,191,7,50,14 + PUSHBUTTON "Atsisakyti",IDCANCEL,191,29,50,14 + LTEXT "&Failo vardas:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Visas &kelias:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Pask. keitimas:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Versija:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&Autoriaus teisÄs:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Dydis:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "PoÅ¾ymiai",-1,7,79,158,46 + CONTROL "&Tik skaitymui",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "&PaslÄptas",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&Archyvuotinas",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&Sisteminis",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "Su&glaudintas",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&Versijos informacija",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "Pritaikomos Å¡rifto nuostatos" + IDS_FONT_SEL_ERROR "Klaida parenkant naujÄ Å¡riftÄ." +} + +STRINGTABLE +{ + IDS_WINEFILE "Wine failÅ³ tvarkytuvÄ" + IDS_ERROR "Klaida" + IDS_ROOT_FS "Å¡akninÄ fs" + IDS_UNIXFS "unix fs" + IDS_DESKTOP "Darbalaukis" + IDS_SHELL "Apvalkalas" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Dar nerealizuota" + IDS_WINE_FILE "Wine failas" +} + +STRINGTABLE +{ + IDS_COL_NAME "Vardas" + IDS_COL_SIZE "Dydis" + IDS_COL_CDATE "KData" + IDS_COL_ADATE "PData" + IDS_COL_MDATE "MData" + IDS_COL_IDX "Indeksas/Inode" + IDS_COL_LINKS "Saitai" + IDS_COL_ATTR "PoÅ¾ymiai" + IDS_COL_SEC "Saugumas" + + IDS_FREE_SPACE_FMT "%s iÅ¡ %s laisva" +} Propchange: trunk/rosapps/applications/winfile/lang/lt-LT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/winfile/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/lang/pt-BR.rc [iso-8859-1] Sat Jul 18 21:48:17 2009 @@ -1,9 +1,9 @@ -/* +ï»¿/* * WineFile * Portuguese Language Support * * Copyright 2003 Marcelo Duarte - * Copyright 2004,2007 Américo José Melo + * Copyright 2004,2007 AmÃ©rico JosÃ© Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) /* Menu */ @@ -72,18 +73,18 @@ MENUITEM "Selecionar &unidade...", 251 } - POPUP "Á&rvore" { - MENUITEM "&Próximo nível\t+", 301 + POPUP "Ã&rvore" { + MENUITEM "&PrÃ³ximo nÃvel\t+", 301 MENUITEM "Expandi&r pasta\t*", 302 MENUITEM "Expandir &tudo\tStrg+*", 303 MENUITEM "Recolher p&asta\t-", 304 MENUITEM SEPARATOR - MENUITEM "&Indicar subníveis", 505 + MENUITEM "&Indicar subnÃveis", 505 } POPUP "&Exibir" { - MENUITEM "Á&rvore e pasta", 413 - MENUITEM "S&omente árvore", 411 + MENUITEM "Ã&rvore e pasta", 413 + MENUITEM "S&omente Ã¡rvore", 411 MENUITEM "So&mente pasta", 412 MENUITEM SEPARATOR MENUITEM "&Dividir", ID_VIEW_SPLIT @@ -100,8 +101,8 @@ MENUITEM "Classificar &por...", ID_VIEW_FILTER } - POPUP "&Opções" { - MENUITEM "&Confirmação...", 501 + POPUP "&OpÃ§Ãµes" { + MENUITEM "&ConfirmaÃ§Ã£o...", 501 MENUITEM "&Fonte...", ID_SELECT_FONT MENUITEM "&Personalizar barra de ferramentas...", 512 MENUITEM SEPARATOR @@ -113,11 +114,11 @@ #endif MENUITEM SEPARATOR MENUITEM "&Minimizar durante o uso", 504 - MENUITEM "&Salvar configurações ao sair",511 - } - - - POPUP "&Segurança" { + MENUITEM "&Salvar configuraÃ§Ãµes ao sair",511 + } + + + POPUP "&SeguranÃ§a" { MENUITEM "&Acesso...", 605 MENUITEM "&Logging...", 606 MENUITEM "&Owner...", 607 @@ -131,12 +132,12 @@ #ifndef _NO_EXTENSIONS MENUITEM "Organizar automaticamente", ID_WINDOW_AUTOSORT #endif - MENUITEM "&Organizar ícones", ID_WINDOW_ARRANGE + MENUITEM "&Organizar Ãcones", ID_WINDOW_ARRANGE MENUITEM "&Atualizar\tF5", ID_REFRESH } POPUP "Aj&uda" { - MENUITEM "&Tópicos da ajuda\tF1", ID_HELP + MENUITEM "&TÃ³picos da ajuda\tF1", ID_HELP MENUITEM "Pesquisar...", ID_HELP MENUITEM "&Usando a ajuda", ID_HELP_USING MENUITEM SEPARATOR @@ -152,7 +153,7 @@ MENUITEM "A&brir\tEnter", ID_ACTIVATE MENUITEM "&Mover...\tF7", ID_FILE_MOVE MENUITEM "&Copiar...\tF8", ID_FILE_COPY - MENUITEM "&Na Area de Transferência...\tF9", 118 + MENUITEM "&Na Area de TransferÃªncia...\tF9", 118 MENUITEM "E&xcluir\tDel", ID_FILE_DELETE MENUITEM "Re&nomear...", 109 MENUITEM "&Propriedades...\tAlt+Enter", ID_EDIT_PROPERTIES @@ -193,18 +194,18 @@ MENUITEM "Seleccionar &unidade...", 251 } - POPUP "Á&rvore" { - MENUITEM "&Próximo nível\t+", 301 + POPUP "Ã&rvore" { + MENUITEM "&PrÃ³ximo nÃvel\t+", 301 MENUITEM "Expandi&r pasta\t*", 302 MENUITEM "Expandir &tudo\tStrg+*", 303 MENUITEM "Recolher p&asta\t-", 304 MENUITEM SEPARATOR - MENUITEM "&Indicar subníveis", 505 + MENUITEM "&Indicar subnÃveis", 505 } POPUP "&Exibir" { - MENUITEM "Á&rvore e pasta", 413 - MENUITEM "A&penas árvore", 411 + MENUITEM "Ã&rvore e pasta", 413 + MENUITEM "A&penas Ã¡rvore", 411 MENUITEM "Ap&enas pasta", 412 MENUITEM SEPARATOR MENUITEM "&Dividir", ID_VIEW_SPLIT @@ -221,8 +222,8 @@ MENUITEM "Classificar &por...", ID_VIEW_FILTER } - POPUP "&Opções" { - MENUITEM "&Confirmação...", 501 + POPUP "&OpÃ§Ãµes" { + MENUITEM "&ConfirmaÃ§Ã£o...", 501 MENUITEM "&Tipo de Letra...", ID_SELECT_FONT MENUITEM "&Personalizar barra de ferramentas...", 512 MENUITEM SEPARATOR @@ -230,17 +231,17 @@ MENUITEM "&Barra de unidades", ID_VIEW_DRIVE_BAR, CHECKED MENUITEM "B&arra de e&stado", ID_VIEW_STATUSBAR, CHECKED #ifndef _NO_EXTENSIONS - MENUITEM "Ecrã Completo\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "EcrÃ£ Completo\tCtrl+Shift+S", ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR MENUITEM "&Minimizar durante o uso", 504 - MENUITEM "&Gravar configurações ao sair",511 - } - - - POPUP "&Segurança" { + MENUITEM "&Gravar configuraÃ§Ãµes ao sair",511 + } + + + POPUP "&SeguranÃ§a" { MENUITEM "&Acesso...", 605 - MENUITEM "&Autenticação...", 606 + MENUITEM "&AutenticaÃ§Ã£o...", 606 MENUITEM "&Dono...", 607 } @@ -252,12 +253,12 @@ #ifndef _NO_EXTENSIONS MENUITEM "Organizar automaticamente", ID_WINDOW_AUTOSORT #endif - MENUITEM "&Organizar ícones", ID_WINDOW_ARRANGE + MENUITEM "&Organizar Ãcones", ID_WINDOW_ARRANGE MENUITEM "&Actualizar\tF5", ID_REFRESH } POPUP "Aj&uda" { - MENUITEM "&Tópicos da ajuda\tF1", ID_HELP + MENUITEM "&TÃ³picos da ajuda\tF1", ID_HELP MENUITEM "Pesquisar...", ID_HELP MENUITEM "&Usar a ajuda", ID_HELP_USING MENUITEM SEPARATOR @@ -302,23 +303,74 @@ IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Selecionar destino" +CAPTION "Seleccionar destino" FONT 8, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Localização:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "&LocalizaÃ§Ã£o:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 PUSHBUTTON "Cancelar", 2, 158, 23, 47, 14 PUSHBUTTON "&Procurar", 254, 158, 43, 47, 14 } +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Por tipo de ficheiro" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Nome:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "Tipo de ficheiro",-1,7,23,87,56 + CONTROL "&DirectÃ³rios",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Programas",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "Docu&mentos",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Outros ficheiros",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "&Mostrar ficheiros ocultos/sistema",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Propriedades de %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,191,29,50,14 + LTEXT "&Nome do ficheiro:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&LocalizaÃ§Ã£o Completa:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Ãltima alteraÃ§Ã£o:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "VersÃ£o:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Direitos de autor:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Tamanho:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Atributos",-1,7,79,158,46 + CONTROL "&Apenas de leitura",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "&Ocultos",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&Arquivos",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&Sistema",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "&Comprimidos",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&InformaÃ§Ã£o de versÃ£o",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE { - IDS_FONT_SEL_DLG_NAME "Aplicando configurações de fonte" + IDS_FONT_SEL_DLG_NAME "Aplicando configuraÃ§Ãµes de fonte" IDS_FONT_SEL_ERROR "Erro enquanto seleciona nova fonte." } @@ -326,12 +378,12 @@ STRINGTABLE { - IDS_FONT_SEL_DLG_NAME "A aplicar configurações do tipo de letra" + IDS_FONT_SEL_DLG_NAME "A aplicar configuraÃ§Ãµes do tipo de letra" IDS_FONT_SEL_ERROR "Erro ao seleccionar novo tipo de letra." } -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE { @@ -339,47 +391,24 @@ IDS_ERROR "Erro" IDS_ROOT_FS "root fs" IDS_UNIXFS "unixfs" - IDS_DESKTOP "Área de trabalho" - IDS_SHELL "Shell" + IDS_DESKTOP "Ãrea de trabalho" + IDS_SHELL "Linha de comandos" IDS_TITLEFMT "%s - %s" - IDS_NO_IMPL "Ainda não implementado" - IDS_WINE_FILE "Wine File" + IDS_NO_IMPL "Ainda nÃ£o implementado" + IDS_WINE_FILE "Ficheiro Wine" +} + +STRINGTABLE +{ IDS_COL_NAME "Nome" IDS_COL_SIZE "Tamanho" IDS_COL_CDATE "CData" IDS_COL_ADATE "AData" IDS_COL_MDATE "MData" - IDS_COL_IDX "Índice/Inode" -} - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE - -STRINGTABLE -{ - IDS_WINEFILE "Winefile" - IDS_ERROR "Erro" - IDS_ROOT_FS "root fs" - IDS_UNIXFS "unixfs" - IDS_DESKTOP "Ecrã" - IDS_SHELL "Linha de Comandos" - IDS_TITLEFMT "%s - %s" - IDS_NO_IMPL "Ainda não implementado" - IDS_WINE_FILE "Ficheiro Wine" - IDS_COL_NAME "Nome" - IDS_COL_SIZE "Tamanho" - IDS_COL_CDATE "CData" - IDS_COL_ADATE "AData" - IDS_COL_MDATE "MData" - IDS_COL_IDX "Índice/Inode" -} - -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_COL_LINKS "Ligações" + IDS_COL_IDX "Ãndice/Inode" + IDS_COL_LINKS "LigaÃ§Ãµes" IDS_COL_ATTR "Atributos" - IDS_COL_SEC "Segurança" - - IDS_FREE_SPACE_FMT "%s of %s free" -} + IDS_COL_SEC "SeguranÃ§a" + + IDS_FREE_SPACE_FMT "%s de %s livre" +} Added: trunk/rosapps/applications/winfile/lang/rm-CH.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/rm-CH.rc (added) +++ trunk/rosapps/applications/winfile/lang/rm-CH.rc [iso-8859-1] Sat Jul 18 21:48:17 2009 @@ -1,0 +1,90 @@ +ï»¿/* + * Help Viewer + * + * Copyright 1996 Ulrich Schmid + * Rumantsch Ladin (Vallader) by mbaur(a)g26.ethz.ch + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * + * 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 + */ + +/* FIXME: This file is in the Vallader Romansh dialect and not in the + official Rumantsch Grischun. */ + +/* Menu */ + +MAIN_MENU MENU LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT +{ + POPUP "&Datoteca" { + MENUITEM "&Rivir", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "&Stampar tema", MNID_FILE_PRINT + MENUITEM "&Installaziun dal stampader...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "&Finir", MNID_FILE_EXIT + } + POPUP "&Lavurar" { + MENUITEM "Capchar", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "&Annotaziun...", MNID_EDIT_ANNOTATE + } + POPUP "&Marca" { + MENUITEM "&Definir...", MNID_BKMK_DEFINE + } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } + POPUP "&Agï¿½d" { + MENUITEM "&Douvrar l'agï¿½d", MNID_HELP_HELPON + MENUITEM "Adï¿½na da&vant", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "I&nfuormaziuns", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "Davart &Wine", MNID_HELP_WINE +#endif + } +} + +/* Strings */ +STRINGTABLE DISCARDABLE LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT +{ +STID_WINE_HELP, "WINE agï¿½d" +STID_WHERROR, "SBAGL" +STID_WARNING, "ATTENZIUN" +STID_INFO, "INFUORMAZIUN" +STID_NOT_IMPLEMENTED, "Na implementa" +STID_HLPFILE_ERROR_s, "Sbagl cun leger la datoteca d'agï¿½d `%s'" +STID_INDEX, "&Cuntgnï¿½" +STID_CONTENTS, "Summary" +STID_BACK, "&Inavo" +STID_ALL_FILES, "Tuot las datotecas (*.*)" +STID_HELP_FILES_HLP, "Datotecas d'agï¿½d (*.hlp)" +STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" +STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_PSH_INDEX, "Help topics: " +} Propchange: trunk/rosapps/applications/winfile/lang/rm-CH.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/winfile/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/ro-RO.rc (added) +++ trunk/rosapps/applications/winfile/lang/ro-RO.rc [iso-8859-1] Sat Jul 18 21:48:17 2009 @@ -1,0 +1,27 @@ +ï»¿/* + * Copyright (C) 2007 Mikolaj Zalewski + * Copyright (C) 2008 Michael Stefaniuc + * + * 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 + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE +{ + IDS_FAILED, "ExecuÈia Wordpad a eÈuat" +} Propchange: trunk/rosapps/applications/winfile/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/winfile/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/sk-SK.rc (added) +++ trunk/rosapps/applications/winfile/lang/sk-SK.rc [iso-8859-1] Sat Jul 18 21:48:17 2009 @@ -1,0 +1,83 @@ +/* + * Help Viewer + * + * Copyright 1996 Ulrich Schmid + * + * 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 + */ + +MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +{ + POPUP "&Súbor" { + MENUITEM "&Otvori...", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "&Tlaèi", MNID_FILE_PRINT + MENUITEM "&Nastavenie tlaèe...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "U&konèi", MNID_FILE_EXIT + } + POPUP "&Upravi" { + MENUITEM "Kopí&rova...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "&Skomentova...", MNID_EDIT_ANNOTATE + } + POPUP "&Záloka" { + MENUITEM "&Definova...", MNID_BKMK_DEFINE + } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } + POPUP "&Pomoc" { + MENUITEM "Pomoc &na pomoci", MNID_HELP_HELPON + MENUITEM "Vdy na &vrchu", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "&Info...", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "O& WINE", MNID_HELP_WINE +#endif + } +} + +/* Strings */ +STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +{ +STID_WINE_HELP, "WINE Pomoc" +STID_WHERROR, "CHYBA" +STID_WARNING, "VAROVANIE" +STID_INFO, "Informácie" +STID_NOT_IMPLEMENTED, "Neimplementované" +STID_HLPFILE_ERROR_s, "Chyba poèas èítania súboru `%s'" +STID_INDEX, "&Obsah" +STID_CONTENTS, "Summary" +STID_BACK, "&Spä" +STID_ALL_FILES, "Vetky súbory (*.*)" +STID_HELP_FILES_HLP, "Súbory pomoci (*.hlp)" +STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" +STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_PSH_INDEX, "Help topics: " +} Propchange: trunk/rosapps/applications/winfile/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/winfile/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/lang/sl-SI.rc [iso-8859-1] Sat Jul 18 21:48:17 2009 @@ -1,4 +1,4 @@ -/* +ï»¿/* * WineFile * Slovenian Language Support * @@ -258,5 +258,3 @@ IDS_FREE_SPACE_FMT "Prosto: %s od %s" } - -#pragma code_page(default) Modified: trunk/rosapps/applications/winfile/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/lang/zh-CN.rc [iso-8859-1] Sat Jul 18 21:48:17 2009 @@ -1,4 +1,4 @@ -/* +ï»¿/* * WineFile * Simplified and Traditional Chinese Language Support * @@ -298,5 +298,3 @@ PUSHBUTTON "åæ¶", 2, 158, 23, 47, 14 PUSHBUTTON "å¹«å©(&H)", 254, 158, 43, 47, 14 } - -#pragma code_page(default) Modified: trunk/rosapps/applications/winfile/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/resou… ============================================================================== --- trunk/rosapps/applications/winfile/resource.h [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/resource.h [iso-8859-1] Sat Jul 18 21:48:17 2009 @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> /* images */ Modified: trunk/rosapps/applications/winfile/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/rsrc.… ============================================================================== --- trunk/rosapps/applications/winfile/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/rsrc.rc [iso-8859-1] Sat Jul 18 21:48:17 2009 @@ -55,21 +55,27 @@ /* include localised resources */ +// #include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" #include "lang/da-DK.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/fi-FI.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" #include "lang/ko-KR.rc" +#include "lang/lt-LT.rc" +#include "lang/nl-NL.rc" #include "lang/no-NO.rc" -#include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" +#include "lang/rm-CH.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/sl-SI.rc" #include "lang/sv-SE.rc" #include "lang/tr-TR.rc"

1 0

[dreimer] 42068: Sync to winhlp32, xcopy to Wine 1.1.26 wordpad sync does not generate a valid win32 resource Out of no reason wine changed the way they include theirs rc files. rsrc.rc is no more and all rcs are added as headers with own includes into the makefile. I have no idea if we plan to do it that way, so I changed this back to the old behavior.
by dreimer＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: dreimer Date: Sat Jul 18 21:47:54 2009 New Revision: 42068 URL: http://svn.reactos.org/svn/reactos?rev=42068&view=rev Log: Sync to winhlp32, xcopy to Wine 1.1.26 wordpad sync does not generate a valid win32 resource Out of no reason wine changed the way they include theirs rc files. rsrc.rc is no more and all rcs are added as headers with own includes into the makefile. I have no idea if we plan to do it that way, so I changed this back to the old behavior. Added: trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc (with props) trunk/reactos/base/applications/winhlp32/lang/ro-RO.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/xcopy/Bg.rc trunk/reactos/base/applications/cmdutils/xcopy/Da.rc trunk/reactos/base/applications/cmdutils/xcopy/De.rc trunk/reactos/base/applications/cmdutils/xcopy/El.rc trunk/reactos/base/applications/cmdutils/xcopy/En.rc trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc trunk/reactos/base/applications/cmdutils/xcopy/It.rc trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc trunk/reactos/base/applications/cmdutils/xcopy/No.rc trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc trunk/reactos/base/applications/cmdutils/xcopy/Si.rc trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h trunk/reactos/base/applications/winhlp32/lang/de-DE.rc trunk/reactos/base/applications/winhlp32/lang/en-US.rc trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc trunk/reactos/base/applications/winhlp32/lang/it-IT.rc trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc trunk/reactos/base/applications/winhlp32/lang/lt-LT.rc trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc trunk/reactos/base/applications/winhlp32/lang/rm-CH.rc trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc trunk/reactos/base/applications/winhlp32/lex.yy.c trunk/reactos/base/applications/winhlp32/rsrc.rc trunk/reactos/base/applications/winhlp32/winhelp.c trunk/reactos/base/applications/winhlp32/winhelp_res.h Modified: trunk/reactos/base/applications/cmdutils/xcopy/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Bg.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Bg.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -18,7 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/cmdutils/xcopy/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Da.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Da.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -18,7 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/cmdutils/xcopy/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -1,4 +1,4 @@ -/* +ï»¿/* * XCOPY - Wine-compatible xcopy program * German language support * @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -27,16 +28,16 @@ { STRING_INVPARMS, "Falsche Parameteranzahl - xcopy /? zeigt Hilfe an\n" STRING_INVPARM, "Unbekannter Parameter '%s' - xcopy /? zeigt Hilfe an\n" - STRING_PAUSE, "Eingabetaste betätigen, um mit dem Kopieren zu beginnen\n" - STRING_SIMCOPY, "%d Datei(en) würden kopiert\n" + STRING_PAUSE, "Eingabetaste betÃ¤tigen, um mit dem Kopieren zu beginnen\n" + STRING_SIMCOPY, "%d Datei(en) wÃ¼rden kopiert\n" STRING_COPY, "%d Datei(en) kopiert\n" STRING_QISDIR, "Ist '%s' eine Datei oder ein Verzeichnis\n" \ "am Zielsort?\n" \ "(D - Datei, V - Verzeichnis)\n" STRING_SRCPROMPT,"%s? (Ja|Nein)\n" - STRING_OVERWRITE,"%s überschreiben? (Ja|Nein|Alle)\n" + STRING_OVERWRITE,"%s Ã¼berschreiben? (Ja|Nein|Alle)\n" STRING_COPYFAIL, "Kopieren von '%s' nach '%s' fehlgeschlagen. Fehlernummer: %d\n" - STRING_OPENFAIL, "Fehler beim Öffnen von '%s'\n" + STRING_OPENFAIL, "Fehler beim Ãffnen von '%s'\n" STRING_READFAIL, "Fehler beim Lesen von '%s'\n" STRING_YES_CHAR, "J" STRING_NO_CHAR, "N" @@ -58,20 +59,20 @@ [/S] Kopiere Verzeichnisse und Unterverzeichnisse\n\ [/E] Kopiere Verzeichnisse und Unterverzeichnisse, auch leere\n\ [/Q] Zeige die Dateinamen beim Kopieren nicht an\n\ -[/F] Zeige vollständige Dateinamen von Quelle und Ziel an\n\ -[/L] Simulation: Zeige die Namen der Datein, die kopiert würden\n\ -[/W] Wartet vor Beginn des Kopierens auf Bestätigung\n\ +[/F] Zeige vollstÃ¤ndige Dateinamen von Quelle und Ziel an\n\ +[/L] Simulation: Zeige die Namen der Datein, die kopiert wÃ¼rden\n\ +[/W] Wartet vor Beginn des Kopierens auf BestÃ¤tigung\n\ [/T] Erzeuge eine leere Verzeichnisstruktur, ohne Dateien zu kopieren\n\ -[/Y] Keine Nachfrage vor dem Überschreiben von Dateien\n\ -[/-Y] Nachrage vor dem Überschreiben von Dateien\n\ -[/P] Fragt für jede Quelldatei, ob sie kopiert werden soll\n\ +[/Y] Keine Nachfrage vor dem Ãberschreiben von Dateien\n\ +[/-Y] Nachrage vor dem Ãberschreiben von Dateien\n\ +[/P] Fragt fÃ¼r jede Quelldatei, ob sie kopiert werden soll\n\ [/N] Kopiert die Dateien unter ihrem Kurznamen\n\ [/U] Kopiert nur Dateien, die am Ziel bereits existieren\n\ -[/R] Überschreibt schreibgeschützte Dateien\n\ +[/R] Ãberschreibt schreibgeschÃ¼tzte Dateien\n\ [/H] Kopiere auch versteckte und Systemdateien\n\ [/C] Nach Fehlern den Kopiervorgang fortsetzen\n\ [/A] Nur Dateien mit Archivbit kopieren\n\ -[/M] Nur Dateien mit Archivbit kopieren, danach Archivbit löschen\n\ +[/M] Nur Dateien mit Archivbit kopieren, danach Archivbit lÃ¶schen\n\ [/D | /D:m-d-y] Kopiere neue Dateien und Dateien, die neuer als das\n\ \t\tangegebene Datum sind. Wird kein Datum angegegebn, werden nur\n\ \t\tQuelldateien kopiert, die neuer sind als die Zieldatei\n\n" Modified: trunk/reactos/base/applications/cmdutils/xcopy/El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/El.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/El.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -18,7 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - LANGUAGE LANG_GREEK, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/cmdutils/xcopy/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -18,7 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -1,4 +1,4 @@ -/* +ï»¿/* * XCOPY - Wine-compatible xcopy program * French language support * @@ -18,6 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #pragma code_page(65001) @@ -30,12 +31,12 @@ STRING_PAUSE, "Appuyez sur ENTRÃE pour dÃ©marrer la copie\n" STRING_SIMCOPY, "%d fichier(s) seront copiÃ©s\n" STRING_COPY, "%d fichier(s) copiÃ©s\n" - STRING_QISDIR, "Est-ce que Â«Â %sÂ Â» est un fichier ou un rÃ©pertoire\n" \ + STRING_QISDIR, "Â«Â %sÂ Â» est-il un fichier ou un rÃ©pertoire\n" \ "dans la destinationÂ ?\n" \ "(F - Fichier, R - RÃ©pertoire)\n" STRING_SRCPROMPT,"%sÂ ? (Oui|Non)\n" STRING_OVERWRITE,"Ãcraser %sÂ ? (Oui|Non|Tous)\n" - STRING_COPYFAIL, "La copie de Â«Â %sÂ Â» vers Â«Â %sÂ Â» a Ã©chouÃ© avec le c/r %d\n" + STRING_COPYFAIL, "La copie de Â«Â %sÂ Â» vers Â«Â %sÂ Â» a Ã©chouÃ© avec le code de retour %d\n" STRING_OPENFAIL, "Impossible d'ouvrir Â«Â %sÂ Â»\n" STRING_READFAIL, "Impossible de lire Â«Â %sÂ Â»\n" STRING_YES_CHAR, "O" @@ -45,38 +46,36 @@ STRING_DIR_CHAR, "R" STRING_HELP, -"XCOPY - Copie les fichiers ou rÃ©pertoires source vers une destination\n\ +"XCOPY - Copie les fichiers ou rÃ©pertoires sources vers une destination\n\ \n\ SyntaxeÂ :\n\ -XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ -OÃ¹Â :\n\ +oÃ¹Â :\n\ \n\ [/I] Suppose que la destination est un rÃ©pertoire si elle n'existe pas et que l'on copie plus\n\ \td'un fichier\n\ [/S] Copie les rÃ©pertoires et sous-rÃ©pertoires\n\ [/E] Copie les rÃ©pertoires et sous-rÃ©pertoires, y compris ceux qui sont vides\n\ [/Q] Ne pas afficher la liste des fichiers copiÃ©s (mode silencieux)\n\ -[/F] Afficher la source et la destination complÃ¨te lors de la copie\n\ -[/L] Simuler l'opÃ©ration, en montrant le nom des fichiers qui auraient Ã©tÃ© copiÃ©s\n\ +[/F] Afficher les source et destination complÃ¨tes lors de la copie\n\ +[/L] Simuler la copie, en montrant le nom des fichiers qui seraient copiÃ©s\n\ [/W] Demande avant de dÃ©marrer la copie\n\ -[/T] CrÃ©er une structure de rÃ©pertoires vides, mais ne copie pas les fichiers\n\ +[/T] CrÃ©er une structure de rÃ©pertoires vides, mais ne pas copier les fichiers\n\ [/Y] Ne demande pas de confirmation lors de l'Ã©crasement des fichiers\n\ [/-Y] Demande une confirmation lors de l'Ã©crasement des fichiers\n\ -[/P] Demande avant de copier chaque fichier source\n\ -[/N] Copie en utilisant des noms courts\n\ +[/P] Interroge l'utilisateur avant de copier chaque fichier source\n\ +[/N] Copie en utilisant les noms courts\n\ [/U] Copie uniquement les fichiers qui existent dÃ©jÃ dans la destination\n\ [/R] Ãcrase mÃªme les fichiers en lecture seule\n\ [/H] Inclure les fichiers cachÃ©s et systÃ¨me dans la copie\n\ [/C] Continue mÃªme si une erreur survient pendant la copie\n\ [/A] Copie uniquement les fichiers qui ont l'attribut archive dÃ©fini\n\ -[/M] Copie uniquement les fichiers qui ont l'attribut archive dÃ©fini, supprime\n\ +[/M] Copie uniquement les fichiers qui ont l'attribut archive dÃ©fini ; supprime\n\ \tensuite l'attribut\n\ -[/D | /D:m-d-y] Copie uniquement les fichiers nouveaux ou ceux modifiÃ©s aprÃ¨s la date spÃ©cifiÃ©e.\n\ -\t\tSi aucune date n'est spÃ©cifiÃ©e, copie uniquement lorsque le fichier de destination est plus vieux\n\ +[/D | /D:m-d-y] Copie uniquement les nouveaux fichiers, ou ceux modifiÃ©s aprÃ¨s la date spÃ©cifiÃ©e.\n\ +\t\tSi aucune date n'est spÃ©cifiÃ©e, copie uniquement lorsque le fichier de destination est plus ancien\n\ \t\tque le fichier source\n\n" } - -#pragma code_page(default) Modified: trunk/reactos/base/applications/cmdutils/xcopy/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/It.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/It.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -18,7 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -19,7 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Added: trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -1,0 +1,81 @@ +ï»¿/* + * XCOPY - Wine-compatible xcopy program + * Lithuanian language support + * + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_INVPARMS, "Neteisingas parametrÅ³ skaiÄius - pagalba: xcopy /?\n" + STRING_INVPARM, "Neteisingas parametras '%s' - pagalba: xcopy /?\n" + STRING_PAUSE, "Spauskite <enter> kopijavimui pradÄti\n" + STRING_SIMCOPY, "bus nukopijuota failÅ³: %d\n" + STRING_COPY, "nukopijuota failÅ³: %d\n" + STRING_QISDIR, "Ar '%s' yra failas, ar katalogas,\n" \ + "ar paskirtis?\n" \ + "(F - failas, K - katalogas)\n" + STRING_SRCPROMPT,"%s? (Taip|Ne)\n" + STRING_OVERWRITE,"PerraÅ¡yti %s? (Taip|Ne|Visus)\n" + STRING_COPYFAIL, "'%s' kopijavimas Ä¯ '%s' nepavyko su r/c %d\n" + STRING_OPENFAIL, "Nepavyko atverti '%s'\n" + STRING_READFAIL, "Klaida skaitant '%s'\n" + STRING_YES_CHAR, "T" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "V" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "K" + + STRING_HELP, +"XCOPY - Kopijuoja Å¡altinio failus ir katalogÅ³ medÅ¾ius Ä¯ paskirties vietÄ\n\ +\n\ +SintaksÄ:\n\ +XCOPY Å¡altinis [paskirtis] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Kur:\n\ +\n\ +[/I] Tarti, kad katalogas, jei paskirtis neegzistuoja ir kopijuojami\n\ +\t2 ar daugiau failÅ³\n\ +[/S] Kopijuoti katalogus ir pakatalogius\n\ +[/E] Kopijuoti katalogus ir pakatalogius, taip pat ir tuÅ¡Äius\n\ +[/Q] Kopijuojant nerodyti vardÅ³, kopijuoti tyliai.\n\ +[/F] Kopijuojant rodyti pilnus Å¡altinio ir paskirties vardus\n\ +[/L] Modeliuoti veikimÄ rodant failus, kurie bÅ«tÅ³ kopijuojami\n\ +[/W] Raginti prieÅ¡ pradedant kopijavimo operacijÄ\n\ +[/T] Sukuria tuÅ¡ÄiÄ katalogÅ³ struktÅ«rÄ, bet nekopijuoja jokiÅ³ failÅ³\n\ +[/Y] Nerodyti raginimÅ³, kai perraÅ¡omi failai\n\ +[/-Y] Ä®jungti raginimus, kai perraÅ¡omi failai\n\ +[/P] Ragina prieÅ¡ kopijuojant kiekvienÄ Å¡altinio failÄ\n\ +[/N] Kopijuoti naudojant trumpus vardus\n\ +[/U] Kopijuoti tik tuos failus, kurie jau egzistuoja paskirties vietoje\n\ +[/R] PerraÅ¡yti visus nekeiÄiamus failus\n\ +[/H] Kopijuoti paslÄptus ir sisteminius failus\n\ +[/C] TÄsti, net jei Ä¯vyksta klaida kopijuojant\n\ +[/A] Kopijuoti tik failus su nustatytu archyvavimo poÅ¾ymiu\n\ +[/M] Kopijuoti tik failus su nustatytu archyvavimo poÅ¾ymiu, paÅ¡alinti\n\ +\tarchyvavimo poÅ¾ymÄ¯\n\ +[/D | /D:m-d-y] Kopijuoti naujus failus arba modifikuotos po nurodytos datos.\n\ +\t\tJei data nenurodyta, kopijuoti tik jei paskirties failas yra\n\ +\t\tsenesnis uÅ¾ Å¡altinio failÄ\n\n" + +} Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -1,4 +1,4 @@ -/* +ï»¿/* * XCOPY - Wine-compatible xcopy program * Dutch language support * @@ -18,7 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/base/applications/cmdutils/xcopy/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/No.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/No.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -18,7 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -19,7 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -18,7 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -19,7 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/cmdutils/xcopy/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Si.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -1,4 +1,4 @@ -/* +ï»¿/* * XCOPY - Wine-compatible xcopy program * Slovenian language support * @@ -78,5 +78,3 @@ \t\tod izvora\n\n" } - -#pragma code_page(default) Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -30,6 +30,7 @@ #include "Fr.rc" #include "It.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc" Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h [iso-8859-1] Sat Jul 18 21:47:54 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 <windef.h> /* Local #defines */ #define RC_OK 0 Modified: trunk/reactos/base/applications/winhlp32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/de-DE.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Help Viewer * * Copyright 1996 Ulrich Schmid @@ -19,12 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL { POPUP "&Datei" { - MENUITEM "Ö&ffnen...", MNID_FILE_OPEN + MENUITEM "Ã&ffnen...", MNID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "Thema &drucken", MNID_FILE_PRINT MENUITEM "Drucker&einrichtung...", MNID_FILE_SETUP @@ -61,7 +63,7 @@ MENUITEM SEPARATOR MENUITEM "&Info...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "&Über WINE", MNID_HELP_WINE + MENUITEM "&Ãber WINE", MNID_HELP_WINE #endif } } @@ -94,7 +96,7 @@ STID_HLPFILE_ERROR_s, "Fehler beim Lesen der Hilfe-Datei `%s'" STID_INDEX, "&Inhalt" STID_CONTENTS, "Summary" -STID_BACK, "&Zurück" +STID_BACK, "&ZurÃ¼ck" STID_ALL_FILES, "Alle Dateien (*.*)" STID_HELP_FILES_HLP, "Hilfe-Dateien (*.hlp)" STID_FILE_NOT_FOUND_s "'%s' konnte nicht gefunden werden. Wollen Sie selber nach dieser Datei suchen?" @@ -109,11 +111,11 @@ MENUITEM "Anmerken...", MNID_CTXT_ANNOTATE MENUITEM "Kopieren", MNID_CTXT_COPY MENUITEM "Drucken...", MNID_CTXT_PRINT -POPUP "Schriftgröße" +POPUP "SchriftgrÃ¶Ãe" BEGIN MENUITEM "Klein", MNID_CTXT_FONTS_SMALL MENUITEM "Normal", MNID_CTXT_FONTS_NORMAL -MENUITEM "Groß", MNID_CTXT_FONTS_LARGE +MENUITEM "GroÃ", MNID_CTXT_FONTS_LARGE END POPUP "Hilfe immer sichtbar" BEGIN Modified: trunk/reactos/base/applications/winhlp32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/en-US.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -54,6 +54,51 @@ MENUITEM "Large", MNID_OPTS_FONTS_LARGE END MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } + POPUP "&Help" { + MENUITEM "Help &on help", MNID_HELP_HELPON + MENUITEM "Always on &top", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "&Info...", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "&About Wine", MNID_HELP_WINE +#endif + } +} + +MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL +{ + POPUP "&File" { + MENUITEM "&Open", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "&Print", MNID_FILE_PRINT + MENUITEM "Printer &setup...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "E&xit", MNID_FILE_EXIT + } + POPUP "&Edit" { + MENUITEM "&Copy...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE + } + POPUP "&Bookmark" { + MENUITEM "&Define...", MNID_BKMK_DEFINE + } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colours", MNID_OPTS_SYSTEM_COLORS } POPUP "&Help" { MENUITEM "Help &on help", MNID_HELP_HELPON @@ -123,3 +168,26 @@ MENUITEM "Use system colors", MNID_CTXT_SYSTEM_COLORS END END + +CONTEXT_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL +BEGIN + POPUP "" + BEGIN + MENUITEM "Annotation...", MNID_CTXT_ANNOTATE + MENUITEM "Copy", MNID_CTXT_COPY + MENUITEM "Print...", MNID_CTXT_PRINT + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_CTXT_FONTS_SMALL + MENUITEM "Normal", MNID_CTXT_FONTS_NORMAL + MENUITEM "Large", MNID_CTXT_FONTS_LARGE + END + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_CTXT_HELP_DEFAULT + MENUITEM "Visible", MNID_CTXT_HELP_VISIBLE + MENUITEM "Non visible", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Use system colours", MNID_CTXT_SYSTEM_COLORS + END +END Modified: trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Help Viewer * * Copyright 1996 Ulrich Schmid @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* UTF-8 */ +#pragma code_page(65001) + /* Menu */ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -34,18 +37,18 @@ MENUITEM SEPARATOR MENUITEM "&Quitter", MNID_FILE_EXIT } - POPUP "É&dition" { + POPUP "Ã&dition" { MENUITEM "&Copier...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "&Annotation...", MNID_EDIT_ANNOTATE + MENUITEM "&Annoter...", MNID_EDIT_ANNOTATE } - POPUP "&Signet" { - MENUITEM "&Définir...", MNID_BKMK_DEFINE + POPUP "&Signets" { + MENUITEM "&DÃ©finir...", MNID_BKMK_DEFINE } POPUP "&Options" { POPUP "Aide toujours visible" BEGIN - MENUITEM "Par défaut", MNID_OPTS_HELP_DEFAULT + MENUITEM "Par dÃ©faut", MNID_OPTS_HELP_DEFAULT MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE END @@ -56,7 +59,7 @@ MENUITEM "Normale", MNID_OPTS_FONTS_NORMAL MENUITEM "Grande", MNID_OPTS_FONTS_LARGE END - MENUITEM "Utiliser les couleurs système", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Utiliser les couleurs systÃ¨me", MNID_OPTS_SYSTEM_COLORS } POPUP "Aid&e" { MENUITEM "&Utiliser l'aide", MNID_HELP_HELPON @@ -64,7 +67,7 @@ MENUITEM SEPARATOR MENUITEM "&Info...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "À &propos de Wine", MNID_HELP_WINE + MENUITEM "Ã &propos de Wine", MNID_HELP_WINE #endif } } @@ -82,7 +85,7 @@ FONT 8, "MS Shell Dlg" CAPTION "Recherche" { - LTEXT "Pas encore implémenté", -1, 10, 10, 180, 150 + LTEXT "Pas encore implÃ©mentÃ©", -1, 10, 10, 180, 150 } /* Strings */ @@ -92,15 +95,15 @@ STID_WHERROR, "ERREUR" STID_WARNING, "ATTENTION" STID_INFO, "Information" -STID_NOT_IMPLEMENTED, "Non implémenté" -STID_HLPFILE_ERROR_s, "Une erreur est survenue en lisant le fichier d'aide « %s »" +STID_NOT_IMPLEMENTED, "Non implÃ©mentÃ©" +STID_HLPFILE_ERROR_s, "Une erreur est survenue en lisant le fichier d'aide Â«Â %sÂ Â»" STID_INDEX, "&Index" STID_CONTENTS, "Sommaire" -STID_BACK, "&Précédent" -STID_ALL_FILES, "Tous fichiers (*.*)" +STID_BACK, "&PrÃ©cÃ©dent" +STID_ALL_FILES, "Tous les fichiers (*.*)" STID_HELP_FILES_HLP, "Fichiers d'aide (*.hlp)" -STID_FILE_NOT_FOUND_s "Impossible de trouver « %s ». Souhaitez-vous rechercher ce fichier vous-même ?" -STID_NO_RICHEDIT "La bibliothèque RichEdit n'a pu être localisée... Abandon" +STID_FILE_NOT_FOUND_s "Impossible de trouver Â«Â %sÂ Â». Souhaitez-vous rechercher ce fichier vous-mÃªmeÂ ?" +STID_NO_RICHEDIT "La bibliothÃ¨que RichEdit n'a pu Ãªtre localisÃ©e... Abandon" STID_PSH_INDEX, "Rubriques d'aide : " } @@ -119,10 +122,10 @@ END POPUP "Aide toujours visible" BEGIN - MENUITEM "Par défaut", MNID_CTXT_HELP_DEFAULT + MENUITEM "Par dÃ©faut", MNID_CTXT_HELP_DEFAULT MENUITEM "Visible", MNID_CTXT_HELP_VISIBLE MENUITEM "Non visible", MNID_CTXT_HELP_NONVISIBLE END - MENUITEM "Utiliser les couleurs système", MNID_CTXT_SYSTEM_COLORS + MENUITEM "Utiliser les couleurs systÃ¨me", MNID_CTXT_SYSTEM_COLORS END END Modified: trunk/reactos/base/applications/winhlp32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/it-IT.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Help Viewer * * Copyright 1996 Ulrich Schmid Modified: trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Help Viewer * * Copyright 1996 Ulrich Schmid @@ -126,5 +126,3 @@ MENUITEM "ã·ã¹ãã ã«ã©ã¼ãä½¿ã", MNID_CTXT_SYSTEM_COLORS END END - -#pragma code_page(default) Modified: trunk/reactos/base/applications/winhlp32/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/lt-LT.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -1,8 +1,7 @@ -/* +ï»¿/* * Help Viewer * - * Copyright 1996 Ulrich Schmid - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * 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 @@ -17,55 +16,56 @@ * 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 - * - * Translation by Vytis "CMan" Girdþijauskas (cman(a)cman.us) */ -LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL /* Menu */ MAIN_MENU MENU { - POPUP "&Byla" { - MENUITEM "&Atverti", MNID_FILE_OPEN - MENUITEM SEPARATOR - MENUITEM "&Spausdinti", MNID_FILE_PRINT - MENUITEM "S&pausdintuvo nuostatos...", MNID_FILE_SETUP + POPUP "&Failas" { + MENUITEM "&Atverti", MNID_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "&Baigti", MNID_FILE_EXIT + MENUITEM "&Spausdinti", MNID_FILE_PRINT + MENUITEM "Spaus&dintuvo nuostatos...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "IÅ¡&eiti", MNID_FILE_EXIT } - POPUP "&Redaguoti" { - MENUITEM "&Kopijuoti...", MNID_EDIT_COPYDLG + POPUP "&Taisa" { + MENUITEM "&Kopijuoti...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "&Komentarai...", MNID_EDIT_ANNOTATE + MENUITEM "Ko&mentuoti...", MNID_EDIT_ANNOTATE } - POPUP "&Þymës" { - MENUITEM "&Kurti...", MNID_BKMK_DEFINE + POPUP "&Adresynas" { + MENUITEM "&ApibrÄÅ¾ti...", MNID_BKMK_DEFINE } POPUP "&Parinktys" { - POPUP "Pagalba visada matoma" + POPUP "Å½inynas visuomet matomas" BEGIN - MENUITEM "Numatyta", MNID_OPTS_HELP_DEFAULT - MENUITEM "Matoma", MNID_OPTS_HELP_VISIBLE - MENUITEM "Nematoma", MNID_OPTS_HELP_NONVISIBLE - END - MENUITEM "Istorija", MNID_OPTS_HISTORY - POPUP "Ðriftas" - BEGIN - MENUITEM "Maþas", MNID_OPTS_FONTS_SMALL - MENUITEM "Normalus", MNID_OPTS_FONTS_NORMAL - MENUITEM "Didelis", MNID_OPTS_FONTS_LARGE - END - MENUITEM "Naudoti sistemos spalvas", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Numatyta", MNID_OPTS_HELP_DEFAULT + MENUITEM "Matomas", MNID_OPTS_HELP_VISIBLE + MENUITEM "Nematomas", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "Istorija", MNID_OPTS_HISTORY + POPUP "Å riftas" + BEGIN + MENUITEM "&MaÅ¾as", MNID_OPTS_FONTS_SMALL + MENUITEM "&Normalus", MNID_OPTS_FONTS_NORMAL + MENUITEM "&Didelis", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Naudoti &sistemos spalvas", MNID_OPTS_SYSTEM_COLORS } - POPUP "&Pagalba" { - MENUITEM "&Turinys", MNID_HELP_HELPON - MENUITEM "Visada &virðuje", MNID_HELP_HELPTOP + POPUP "&Å½inynas" { + MENUITEM "Pa&galba apie Å¾inynÄ", MNID_HELP_HELPON + MENUITEM "&Visada virÅ¡uje", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "&Apie", MNID_HELP_ABOUT + MENUITEM "&Informacija...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "Apie &Wine", MNID_HELP_WINE + MENUITEM "&Apie Wine", MNID_HELP_WINE #endif } } @@ -73,7 +73,7 @@ IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Rodyklë" +CAPTION "Indeksas" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } @@ -81,49 +81,49 @@ IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Paieðka" +CAPTION "PaieÅ¡ka" { - LTEXT "Dar nesukurta", -1, 10, 10, 180, 150 + LTEXT "Dar nerealizuota", -1, 10, 10, 180, 150 } /* Strings */ STRINGTABLE DISCARDABLE { -STID_WINE_HELP, "Wine Pagalba" -STID_WHERROR, "KLAIDA" -STID_WARNING, "DËMESIO" -STID_INFO, "Informacija" -STID_NOT_IMPLEMENTED, "Dar nesukurta" -STID_HLPFILE_ERROR_s, "Ávyko klaida skaitant pagalbos bylà '%s'." -STID_INDEX, "&Rodyklë" -STID_CONTENTS, "&Turinys" -STID_BACK, "&Atgal" -STID_ALL_FILES, "Visos bylos (*.*)" -STID_HELP_FILES_HLP, "Pagalbos bylos (*.hlp)" -STID_FILE_NOT_FOUND_s "Nepavyko rasti '%s'. Ar norëtumëte pabandyti surasti ðia bylà patys?" -STID_NO_RICHEDIT "Nerastas richedit palaikymas... Darbas nutraukiamas" -STID_PSH_INDEX, "Pagalbos temos: " +STID_WINE_HELP, "Wine Å¾inynas" +STID_WHERROR, "KLAIDA" +STID_WARNING, "Ä®SPÄJIMAS" +STID_INFO, "Informacija" +STID_NOT_IMPLEMENTED, "Nerealizuota" +STID_HLPFILE_ERROR_s, "Klaida skaitant Å¾inyno failÄ â%sâ" +STID_INDEX, "&RodyklÄ" +STID_CONTENTS, "Santrauka" +STID_BACK, "&Atgal" +STID_ALL_FILES, "Visi failai (*.*)" +STID_HELP_FILES_HLP, "Å½inyno failai (*.hlp)" +STID_FILE_NOT_FOUND_s "Nepavyko rasti â%sâ. Ar norite rasti Å¡Ä¯ failÄ patys?" +STID_NO_RICHEDIT "Nepavyko rasti RichEdit realizacijos... Nutraukiama" +STID_PSH_INDEX, "Å½inyno temos: " } CONTEXT_MENU MENU BEGIN - POPUP "" - BEGIN - MENUITEM "Komentarai...", MNID_CTXT_ANNOTATE - MENUITEM "Kopijuoti", MNID_CTXT_COPY - MENUITEM "Spausdinti...", MNID_CTXT_PRINT - POPUP "Ðriftas" - BEGIN - MENUITEM "Maþas", MNID_CTXT_FONTS_SMALL - MENUITEM "Normalus", MNID_CTXT_FONTS_NORMAL - MENUITEM "Didelis", MNID_CTXT_FONTS_LARGE - END - POPUP "Pagalba visada matoma" - BEGIN - MENUITEM "Numatyta", MNID_CTXT_HELP_DEFAULT - MENUITEM "Matoma", MNID_CTXT_HELP_VISIBLE - MENUITEM "Nematoma", MNID_CTXT_HELP_NONVISIBLE - END - MENUITEM "Naudoti sistemos spalvas", MNID_CTXT_SYSTEM_COLORS - END + POPUP "" + BEGIN + MENUITEM "Komentuoti...", MNID_CTXT_ANNOTATE + MENUITEM "Kopijuoti", MNID_CTXT_COPY + MENUITEM "Spausdinti...", MNID_CTXT_PRINT + POPUP "Å riftas" + BEGIN + MENUITEM "MaÅ¾as", MNID_CTXT_FONTS_SMALL + MENUITEM "Normalus", MNID_CTXT_FONTS_NORMAL + MENUITEM "Didelis", MNID_CTXT_FONTS_LARGE + END + POPUP "Å½inynas visuomet matomas" + BEGIN + MENUITEM "Numatyta", MNID_CTXT_HELP_DEFAULT + MENUITEM "Matomas", MNID_CTXT_HELP_VISIBLE + MENUITEM "Nematomas", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Naudoti sistemos spalvas", MNID_CTXT_SYSTEM_COLORS + END END Modified: trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Help Viewer (Dutch resources) * * Copyright 2003 Hans Leidekker @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL @@ -32,28 +34,28 @@ MENUITEM "&Afsluiten", MNID_FILE_EXIT } POPUP "&Bewerken" { - MENUITEM "&Kopiëren...", MNID_EDIT_COPYDLG + MENUITEM "&KopiÃ«ren...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR MENUITEM "&Annoteren...", MNID_EDIT_ANNOTATE } POPUP "&Favorieten" { MENUITEM "&Aanmaken...", MNID_BKMK_DEFINE } - POPUP "&Options" { - POPUP "Help always visible" + POPUP "&Opties" { + POPUP "Help altijd zichtbaar" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "Standaard", MNID_OPTS_HELP_DEFAULT + MENUITEM "Zichtbaar", MNID_OPTS_HELP_VISIBLE + MENUITEM "Niet zichtbaar", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "Historie", MNID_OPTS_HISTORY + POPUP "Lettertype" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL - MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "Klein", MNID_OPTS_FONTS_SMALL + MENUITEM "Standaard", MNID_OPTS_FONTS_NORMAL + MENUITEM "Groot", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Gebruik systeemkleuren", MNID_OPTS_SYSTEM_COLORS } POPUP "&Help" { MENUITEM "Hulp &bij help", MNID_HELP_HELPON @@ -61,7 +63,7 @@ MENUITEM SEPARATOR MENUITEM "&Info...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "&Over WINE", MNID_HELP_WINE + MENUITEM "&Over Wine", MNID_HELP_WINE #endif } } @@ -79,26 +81,26 @@ FONT 8, "MS Shell Dlg" CAPTION "Zoeken" { - LTEXT "Nog niet geimplementeerd", -1, 10, 10, 180, 150 + LTEXT "Nog niet geÃ¯mplementeerd", -1, 10, 10, 180, 150 } /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL { -STID_WINE_HELP, "WINE Help" +STID_WINE_HELP, "Wine Help" STID_WHERROR, "FOUT" STID_WARNING, "WAARSCHUWING" STID_INFO, "Informatie" -STID_NOT_IMPLEMENTED, "Niet geïmplementeerd" -STID_HLPFILE_ERROR_s, "Fout bij het lezen van het helpbestand `%s'" -STID_INDEX, "&Inhoud" -STID_CONTENTS, "Summary" +STID_NOT_IMPLEMENTED, "Niet geÃ¯mplementeerd" +STID_HLPFILE_ERROR_s, "Fout bij het lezen van het helpbestand '%s'" +STID_INDEX, "Inde&x" +STID_CONTENTS, "&Inhoudsopgave" STID_BACK, "&Terug" STID_ALL_FILES, "Alle bestanden (*.*)" STID_HELP_FILES_HLP, "Helpbestanden (*.hlp)" STID_FILE_NOT_FOUND_s "Kan '%s' niet openen. Wilt u zelf dit bestand zoeken?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " +STID_NO_RICHEDIT "Kan geen richedit implementatie vinden... Actie afgebroken" +STID_PSH_INDEX, "Help onderwerpen: " } CONTEXT_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL @@ -106,7 +108,7 @@ POPUP "" BEGIN MENUITEM "Annotering...", MNID_CTXT_ANNOTATE - MENUITEM "Kopiëren", MNID_CTXT_COPY + MENUITEM "KopiÃ«ren", MNID_CTXT_COPY MENUITEM "Print...", MNID_CTXT_PRINT POPUP "Lettertypes" BEGIN Modified: trunk/reactos/base/applications/winhlp32/lang/rm-CH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/rm-CH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/rm-CH.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Help Viewer * * Copyright 1996 Ulrich Schmid Added: trunk/reactos/base/applications/winhlp32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/winhlp32/lang/ro-RO.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -1,0 +1,27 @@ +ï»¿/* + * Copyright (C) 2007 Mikolaj Zalewski + * Copyright (C) 2008 Michael Stefaniuc + * + * 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 + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE +{ + IDS_FAILED, "ExecuÈia Wordpad a eÈuat" +} Propchange: trunk/reactos/base/applications/winhlp32/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Help Viewer (Slovenian Resources) * * Copyright 2002, 2003, 2008 Rok Mandeljc @@ -124,5 +124,3 @@ MENUITEM "Uporabi sistemske barve", MNID_CTXT_SYSTEM_COLORS END END - -#pragma code_page(default) Modified: trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Help Viewer * Simplified and Traditional Chinese Language Support * @@ -158,5 +158,3 @@ STID_NO_RICHEDIT "æ¾ä¸å° richedit... çµæ¢" STID_PSH_INDEX, "å¹«å©å§å®¹: " } - -#pragma code_page(default) Modified: trunk/reactos/base/applications/winhlp32/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -380,9 +380,9 @@ #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 ".\\macro.lex.l" +#line 1 "macro.lex.l" #define INITIAL 0 -#line 2 ".\\macro.lex.l" +#line 2 "macro.lex.l" /* * Help Viewer * @@ -407,7 +407,7 @@ #define YY_NO_UNPUT 1 #define quote 1 -#line 26 ".\\macro.lex.l" +#line 26 "macro.lex.l" #include "config.h" #include <assert.h> #include <stdarg.h> @@ -593,7 +593,7 @@ register char *yy_cp, *yy_bp; register int yy_act; -#line 61 ".\\macro.lex.l" +#line 61 "macro.lex.l" #line 600 "lex.yy.c" @@ -681,32 +681,32 @@ case 1: YY_RULE_SETUP -#line 63 ".\\macro.lex.l" +#line 63 "macro.lex.l" yylval.integer = strtol(yytext, NULL, 10); return INTEGER; YY_BREAK case 2: YY_RULE_SETUP -#line 64 ".\\macro.lex.l" +#line 64 "macro.lex.l" yylval.integer = strtol(yytext, NULL, 16); return INTEGER; YY_BREAK case 3: YY_RULE_SETUP -#line 66 ".\\macro.lex.l" +#line 66 "macro.lex.l" return MACRO_Lookup(yytext, &yylval); YY_BREAK case 4: -#line 69 ".\\macro.lex.l" +#line 69 "macro.lex.l" case 5: -#line 70 ".\\macro.lex.l" +#line 70 "macro.lex.l" case 6: -#line 71 ".\\macro.lex.l" +#line 71 "macro.lex.l" case 7: -#line 72 ".\\macro.lex.l" +#line 72 "macro.lex.l" case 8: -#line 73 ".\\macro.lex.l" +#line 73 "macro.lex.l" case 9: YY_RULE_SETUP -#line 73 ".\\macro.lex.l" +#line 73 "macro.lex.l" { if (lex_data->quote_stk_idx == 0 || (yytext[0] == '\"' && lex_data->quote_stack[lex_data->quote_stk_idx - 1] != '\"') || @@ -741,31 +741,31 @@ YY_BREAK case 10: YY_RULE_SETUP -#line 105 ".\\macro.lex.l" +#line 105 "macro.lex.l" *lex_data->strptr++ = yytext[0]; YY_BREAK case 11: YY_RULE_SETUP -#line 106 ".\\macro.lex.l" +#line 106 "macro.lex.l" *lex_data->strptr++ = yytext[1]; YY_BREAK case YY_STATE_EOF(quote): -#line 107 ".\\macro.lex.l" +#line 107 "macro.lex.l" return 0; YY_BREAK case 12: YY_RULE_SETUP -#line 109 ".\\macro.lex.l" +#line 109 "macro.lex.l" YY_BREAK case 13: YY_RULE_SETUP -#line 110 ".\\macro.lex.l" +#line 110 "macro.lex.l" return yytext[0]; YY_BREAK case 14: YY_RULE_SETUP -#line 111 ".\\macro.lex.l" +#line 111 "macro.lex.l" ECHO; YY_BREAK #line 772 "lex.yy.c" @@ -1654,7 +1654,7 @@ return 0; } #endif -#line 111 ".\\macro.lex.l" +#line 111 "macro.lex.l" #if 0 Modified: trunk/reactos/base/applications/winhlp32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -32,7 +32,7 @@ #include "lang/cs-CZ.rc" #include "lang/da-DK.rc" #include "lang/de-DE.rc" -// #include "lang/el-GR.rc" +#include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fi-FI.rc" @@ -46,7 +46,8 @@ #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" -// #include "lang/rm-CH.rc" +#include "lang/rm-CH.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sl-SI.rc" #include "lang/sk-SK.rc" Modified: trunk/reactos/base/applications/winhlp32/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -1736,7 +1736,7 @@ WINHELP_GetWindowInfo(hlpfile, wndname), show); /* Message loop */ - while (GetMessage(&msg, 0, 0, 0)) + while ((Globals.win_list || Globals.active_popup) && GetMessage(&msg, 0, 0, 0)) { TranslateMessage(&msg); DispatchMessage(&msg); Modified: trunk/reactos/base/applications/winhlp32/winhelp_res.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp_res.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp_res.h [iso-8859-1] Sat Jul 18 21:47:54 2009 @@ -1,3 +1,6 @@ +#include <windef.h> +#include <winuser.h> + #define MNID_FILE_OPEN 0x101 #define MNID_FILE_PRINT 0x104 #define MNID_FILE_SETUP 0x106

1 0

[fireball] 42067: - Add a precompiled libX11.a lib. It's made from an Xming official source code tarball crosscompiled in a latest Ubuntu release. In order to use, copy this file to obj-i386/lib/3rdparty/libX11.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 21:43:40 2009 New Revision: 42067 URL: http://svn.reactos.org/svn/reactos?rev=42067&view=rev Log: - Add a precompiled libX11.a lib. It's made from an Xming official source code tarball crosscompiled in a latest Ubuntu release. In order to use, copy this file to obj-i386/lib/3rdparty/libX11. Added: branches/arwinss/reactos/lib/3rdparty/libX11/libX11.a (with props) Added: branches/arwinss/reactos/lib/3rdparty/libX11/libX11.a URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/3rdparty/li… ============================================================================== Binary file - no diff available. Propchange: branches/arwinss/reactos/lib/3rdparty/libX11/libX11.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[fireball] 42066: - Remove unneeded files. - #ifdef 0 incompatible code. - winex11 fully builds.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 21:37:33 2009 New Revision: 42066 URL: http://svn.reactos.org/svn/reactos?rev=42066&view=rev Log: - Remove unneeded files. - #ifdef 0 incompatible code. - winex11 fully builds. Removed: branches/arwinss/reactos/dll/win32/winex11.drv/Makefile.in branches/arwinss/reactos/dll/win32/winex11.drv/version.rc Modified: branches/arwinss/reactos/dll/win32/winex11.drv/brush.c branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c branches/arwinss/reactos/dll/win32/winex11.drv/dib.c branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c branches/arwinss/reactos/dll/win32/winex11.drv/settings.c branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c Removed: branches/arwinss/reactos/dll/win32/winex11.drv/Makefile.in URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/Makefile.in [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/Makefile.in (removed) @@ -1,51 +1,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = winex11.drv -IMPORTS = user32 gdi32 advapi32 imm32 kernel32 ntdll -DELAYIMPORTS = comctl32 -EXTRAINCL = @X_CFLAGS@ -EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ - -C_SRCS = \ - bitblt.c \ - bitmap.c \ - brush.c \ - clipboard.c \ - codepage.c \ - desktop.c \ - dib.c \ - dib_convert.c \ - dib_dst_swap.c \ - dib_src_swap.c \ - event.c \ - graphics.c \ - ime.c \ - init.c \ - keyboard.c \ - mouse.c \ - opengl.c \ - palette.c \ - pen.c \ - scroll.c \ - settings.c \ - systray.c \ - text.c \ - window.c \ - wintab.c \ - x11ddraw.c \ - x11drv_main.c \ - xdnd.c \ - xfont.c \ - xim.c \ - xinerama.c \ - xrandr.c \ - xrender.c \ - xvidmode.c - -RC_SRCS = version.rc - -@MAKE_DLL_RULES@ - -@DEPENDENCIES@ # everything below this line is overwritten by make depend Modified: branches/arwinss/reactos/dll/win32/winex11.drv/brush.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/brush.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/brush.c [iso-8859-1] Sat Jul 18 21:37:33 2009 @@ -300,6 +300,7 @@ case BS_DIBPATTERN: TRACE("BS_DIBPATTERN\n"); +#ifndef __REACTOS__ if ((bmpInfo = GlobalLock16( logbrush.lbHatch ))) { int size = bitmap_info_size( bmpInfo, logbrush.lbColor ); @@ -311,7 +312,7 @@ DeleteObject( hBitmap ); GlobalUnlock16( logbrush.lbHatch ); } - +#endif break; } return hbrush; Modified: branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c [iso-8859-1] Sat Jul 18 21:37:33 2009 @@ -705,15 +705,16 @@ { DeleteMetaFile(((METAFILEPICT *)GlobalLock( lpData->hData32 ))->hMF ); GlobalFree(lpData->hData32); - +#ifndef __REACTOS__ if (lpData->hData16) /* HMETAFILE16 and HMETAFILE32 are apparently the same thing, and a shallow copy is enough to share a METAFILEPICT structure between 16bit and 32bit clipboards. The MetaFile should of course only be deleted once. */ GlobalFree16(lpData->hData16); +#endif } - +#ifndef __REACTOS__ if (lpData->hData16) { METAFILEPICT16* lpMetaPict = GlobalLock16(lpData->hData16); @@ -728,6 +729,7 @@ GlobalFree16(lpData->hData16); } +#endif } else if (lpData->wFormatID == CF_ENHMETAFILE) { @@ -739,9 +741,10 @@ { if (lpData->hData32) GlobalFree(lpData->hData32); - +#ifndef __REACTOS__ if (lpData->hData16) GlobalFree16(lpData->hData16); +#endif } lpData->hData16 = 0; @@ -983,10 +986,12 @@ { lpstrS = GlobalLock(lpSource->hData32); } +#ifndef __REACTOS__ else { lpstrS = GlobalLock16(lpSource->hData16); } +#endif if (!lpstrS) return FALSE; @@ -1028,8 +1033,10 @@ /* Unlock source */ if (lpSource->hData32) GlobalUnlock(lpSource->hData32); +#ifndef __REACTOS__ else GlobalUnlock16(lpSource->hData16); +#endif return X11DRV_CLIPBOARD_InsertClipboardData(wFormatID, 0, hData32, 0, NULL, TRUE); } @@ -2715,6 +2722,7 @@ */ BOOL CDECL X11DRV_GetClipboardData(UINT wFormat, HANDLE16* phData16, HANDLE* phData32) { +#ifndef __REACTOS__ CLIPBOARDINFO cbinfo; LPWINE_CLIPDATA lpRender; @@ -2806,7 +2814,7 @@ return lpRender->hData16 || lpRender->hData32; } - +#endif return 0; } Modified: branches/arwinss/reactos/dll/win32/winex11.drv/dib.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/dib.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/dib.c [iso-8859-1] Sat Jul 18 21:37:33 2009 @@ -4366,7 +4366,7 @@ BOOL found = FALSE; BYTE *addr; struct list *ptr; - const size_t pagemask = getpagesize() - 1; + const size_t pagemask = 4096 - 1; if (ep->ExceptionRecord->ExceptionCode != EXCEPTION_ACCESS_VIOLATION) return EXCEPTION_CONTINUE_SEARCH; Modified: branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c [iso-8859-1] Sat Jul 18 21:37:33 2009 @@ -74,3 +74,9 @@ { } +struct _stat; +int CDECL fstat(int fd, struct _stat* buf) +{ + int CDECL _fstat(int fd, struct _stat* buf); + return _fstat(fd, buf); +} Modified: branches/arwinss/reactos/dll/win32/winex11.drv/settings.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/settings.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/settings.c [iso-8859-1] Sat Jul 18 21:37:33 2009 @@ -35,6 +35,8 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(x11settings); + +#define HandleToULong(h) ((ULONG)(ULONG_PTR)(h)) /* * The DDHALMODEINFO type is used to hold all the mode information. Removed: branches/arwinss/reactos/dll/win32/winex11.drv/version.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/version.rc [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/version.rc (removed) @@ -1,22 +1,0 @@ -/* - * Copyright (c) 2007 Alexandre Julliard - * - * 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 - */ - -#define WINE_FILEDESCRIPTION_STR "Wine X11 driver" -#define WINE_FILENAME_STR "winex11.drv" - -#include "wine/wine_common_ver.rc" Modified: branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild [iso-8859-1] Sat Jul 18 21:37:33 2009 @@ -42,8 +42,11 @@ <file>winex11.rc</file> <library>libX11</library> + <library>pseh</library> <library>advapi32</library> + <library>msvcrt</library> <library>wine</library> + <library>comctl32</library> <library>imm32</library> <library>gdi32</library> <library>user32</library> Modified: branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c [iso-8859-1] Sat Jul 18 21:37:33 2009 @@ -48,7 +48,7 @@ #include "x11drv.h" #include "xvidmode.h" -#include "xrandr.h" +//#include "xrandr.h" #include "xcomposite.h" #include "wine/server.h" #include "wine/debug.h" @@ -498,9 +498,9 @@ /* Open display */ - if (!(display = XOpenDisplay( NULL ))) return FALSE; - - fcntl( ConnectionNumber(display), F_SETFD, 1 ); /* set close on exec flag */ + if (!(display = XOpenDisplay( "192.168.1.159:0.0" ))) return FALSE; + + //fcntl( ConnectionNumber(display), F_SETFD, 1 ); /* set close on exec flag */ screen = DefaultScreenOfDisplay( display ); visual = DefaultVisual( display, DefaultScreen(display) ); root_window = DefaultRootWindow( display ); @@ -600,6 +600,7 @@ /* store the display fd into the message queue */ static void set_queue_display_fd( Display *display ) { +#if 0 HANDLE handle; int ret; @@ -620,6 +621,7 @@ ExitProcess(1); } CloseHandle( handle ); +#endif } @@ -638,7 +640,7 @@ ExitProcess(1); } wine_tsx11_lock(); - if (!(data->display = XOpenDisplay(NULL))) + if (!(data->display = XOpenDisplay("192.168.1.159:0.0"))) { wine_tsx11_unlock(); MESSAGE( "x11drv: Can't open display: %s\n", XDisplayName(NULL) ); @@ -646,7 +648,7 @@ ExitProcess(1); } - fcntl( ConnectionNumber(data->display), F_SETFD, 1 ); /* set close on exec flag */ + //fcntl( ConnectionNumber(data->display), F_SETFD, 1 ); /* set close on exec flag */ #ifdef HAVE_XKB if (use_xkb && XkbUseExtension( data->display, NULL, NULL )) Modified: branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c [iso-8859-1] Sat Jul 18 21:37:33 2009 @@ -1825,7 +1825,7 @@ */ static char* XFONT_UserMetricsCache( char* buffer, int* buf_size ) { - const char *confdir = wine_get_config_dir(); + const char *confdir = "";//wine_get_config_dir(); const char *display_name = XDisplayName(NULL); int len = strlen(confdir) + strlen(INIFontMetrics) + strlen(display_name) + 8; int display = 0;

1 0

[dchapyshev] 42065: - Partially sync with Wine 1.1.26
by dchapyshev＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: dchapyshev Date: Sat Jul 18 21:25:33 2009 New Revision: 42065 URL: http://svn.reactos.org/svn/reactos?rev=42065&view=rev Log: - Partially sync with Wine 1.1.26 Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec trunk/reactos/dll/win32/shlwapi/string.c Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] Sat Jul 18 21:25:33 2009 @@ -215,7 +215,7 @@ 215 stdcall -noname SHAnsiToUnicode(str ptr long) 216 stdcall -noname SHAnsiToUnicodeCP(long str ptr long) 217 stdcall -noname SHUnicodeToAnsi(wstr ptr ptr) -218 stdcall -noname SHUnicodeToAnsiCP(long wstr ptr ptr) +218 stdcall -noname SHUnicodeToAnsiCP(long wstr ptr long) 219 stdcall -noname QISearch(long long long long) 220 stdcall -noname SHSetDefaultDialogFont(ptr long) 221 stdcall -noname SHRemoveDefaultDialogFont(ptr) @@ -477,7 +477,7 @@ 477 stub -noname SHCreatePropertyBagOnMemory 478 stdcall -noname IUnknown_TranslateAcceleratorIO(ptr ptr) 479 stub -noname IUnknown_UIActivateIO -480 stub -noname UrlCrackW +480 stdcall -noname UrlCrackW(wstr long long ptr) wininet.InternetCrackUrlW 481 stdcall -noname IUnknown_HasFocusIO(ptr) 482 stub -noname SHMessageBoxHelpA 483 stub -noname SHMessageBoxHelpW Modified: trunk/reactos/dll/win32/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/string.c… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/string.c [iso-8859-1] Sat Jul 18 21:25:33 2009 @@ -2477,20 +2477,24 @@ * CodePage [I] Code page to use for the conversion * lpSrcStr [I] Source Unicode string to convert * lpDstStr [O] Destination for converted Ascii string - * lpiLen [I/O] Input length of lpDstStr/destination for length of lpDstStr - * - * RETURNS - * Success: The number of characters that result from the conversion. - * Failure: 0. - */ -INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, - LPINT lpiLen) + * dstlen [I] Length of buffer at lpDstStr + * + * RETURNS + * Success: The length in bytes of the result at lpDstStr (including the terminator) + * Failure: When using CP_UTF8, CP_UTF7 or 0xc350 as codePage, 0 is returned and + * the result is not nul-terminated. + * When using a different codepage, the length in bytes of the truncated + * result at lpDstStr (including the terminator) is returned and + * lpDstStr is always nul-terminated. + * + */ +DWORD WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, int dstlen) { static const WCHAR emptyW[] = { '\0' }; int len , reqLen; LPSTR mem; - if (!lpDstStr || !lpiLen) + if (!lpDstStr || !dstlen) return 0; if (!lpSrcStr) @@ -2509,41 +2513,41 @@ case CP_UTF8: { DWORD dwMode = 0; - INT nWideCharCount = len - 1; - - if (ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, - &nWideCharCount, lpDstStr, - lpiLen) == S_OK) + INT lenW = len - 1; + INT needed = dstlen - 1; + HRESULT hr; + + /* try the user supplied buffer first */ + hr = ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &lenW, lpDstStr, &needed); + if (hr == S_OK) + { + lpDstStr[needed] = '\0'; + return needed + 1; + } + + /* user buffer too small. exclude termination and copy as much as possible */ + lenW = len; + hr = ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &lenW, NULL, &needed); + needed++; + mem = HeapAlloc(GetProcessHeap(), 0, needed); + if (!mem) return 0; - if (nWideCharCount < len - 1) + hr = ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &len, mem, &needed); + if (hr == S_OK) { - mem = HeapAlloc(GetProcessHeap(), 0, *lpiLen); - if (!mem) - return 0; - - *lpiLen = 0; - - if (ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &len, - mem, lpiLen) != S_OK) - { - SHTruncateString(mem, *lpiLen); - lstrcpynA(lpDstStr, mem, *lpiLen + 1); - HeapFree(GetProcessHeap(), 0, mem); - return *lpiLen + 1; - } - HeapFree(GetProcessHeap(), 0, mem); - return *lpiLen; + reqLen = SHTruncateString(mem, dstlen); + if (reqLen > 0) memcpy(lpDstStr, mem, reqLen-1); } - lpDstStr[*lpiLen] = '\0'; - return *lpiLen; + HeapFree(GetProcessHeap(), 0, mem); + return 0; } default: break; } - reqLen = WideCharToMultiByte(CodePage, 0, lpSrcStr, len, lpDstStr, - *lpiLen, NULL, NULL); + /* try the user supplied buffer first */ + reqLen = WideCharToMultiByte(CodePage, 0, lpSrcStr, len, lpDstStr, dstlen, NULL, NULL); if (!reqLen && GetLastError() == ERROR_INSUFFICIENT_BUFFER) { @@ -2556,12 +2560,12 @@ reqLen = WideCharToMultiByte(CodePage, 0, lpSrcStr, len, mem, reqLen, NULL, NULL); - reqLen = SHTruncateString(mem, *lpiLen); + reqLen = SHTruncateString(mem, dstlen -1); reqLen++; - lstrcpynA(lpDstStr, mem, *lpiLen); - + lstrcpynA(lpDstStr, mem, reqLen); HeapFree(GetProcessHeap(), 0, mem); + lpDstStr[reqLen-1] = '\0'; } } } @@ -2586,9 +2590,7 @@ */ INT WINAPI SHUnicodeToAnsi(LPCWSTR lpSrcStr, LPSTR lpDstStr, INT iLen) { - INT myint = iLen; - - return SHUnicodeToAnsiCP(CP_ACP, lpSrcStr, lpDstStr, &myint); + return SHUnicodeToAnsiCP(CP_ACP, lpSrcStr, lpDstStr, iLen); } /*************************************************************************

1 0

[dchapyshev] 42064: - Add SEH protection at memory copying. Fixes crash at "setupapi_winetest devinst"
by dchapyshev＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: dchapyshev Date: Sat Jul 18 21:22:12 2009 New Revision: 42064 URL: http://svn.reactos.org/svn/reactos?rev=42064&view=rev Log: - Add SEH protection at memory copying. Fixes crash at "setupapi_winetest devinst" Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Sat Jul 18 21:22:12 2009 @@ -4137,8 +4137,19 @@ Source = &((struct DeviceInfo *)DeviceInfoData->Reserved)->InstallParams; else Source = &list->InstallParams; - memcpy(DeviceInstallParams, Source, Source->cbSize); + ret = TRUE; + + _SEH2_TRY + { + memcpy(DeviceInstallParams, Source, Source->cbSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(RtlNtStatusToDosError(_SEH2_GetExceptionCode())); + ret = FALSE; + } + _SEH2_END; } TRACE("Returning %d\n", ret);

1 0

[fireball] 42063: - Add wine/port.h to event.c to have POLL* defines. - Add XBUTTON* defines to x11drv.h. - Add HAVE_POLL section to wine/port.h.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 21:18:18 2009 New Revision: 42063 URL: http://svn.reactos.org/svn/reactos?rev=42063&view=rev Log: - Add wine/port.h to event.c to have POLL* defines. - Add XBUTTON* defines to x11drv.h. - Add HAVE_POLL section to wine/port.h. Modified: branches/arwinss/reactos/dll/win32/winex11.drv/event.c branches/arwinss/reactos/dll/win32/winex11.drv/x11drv.h branches/arwinss/reactos/include/reactos/wine/port.h Modified: branches/arwinss/reactos/dll/win32/winex11.drv/event.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/event.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/event.c [iso-8859-1] Sat Jul 18 21:18:18 2009 @@ -20,7 +20,7 @@ */ #include "config.h" - +#include "wine/port.h" #ifdef HAVE_POLL_H #include <poll.h> #endif Modified: branches/arwinss/reactos/dll/win32/winex11.drv/x11drv.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/x11drv.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/x11drv.h [iso-8859-1] Sat Jul 18 21:18:18 2009 @@ -785,4 +785,7 @@ #define XEMBED_MAPPED (1 << 0) +#define XBUTTON1 0x0001 +#define XBUTTON2 0x0002 + #endif /* __WINE_X11DRV_H */ Modified: branches/arwinss/reactos/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/port.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/port.h [iso-8859-1] Sat Jul 18 21:18:18 2009 @@ -254,6 +254,22 @@ void *memmove(void *dest, const void *src, size_t len); #endif /* !defined(HAVE_MEMMOVE) */ +#ifndef HAVE_POLL +struct pollfd +{ + int fd; + short events; + short revents; +}; +#define POLLIN 0x01 +#define POLLPRI 0x02 +#define POLLOUT 0x04 +#define POLLERR 0x08 +#define POLLHUP 0x10 +#define POLLNVAL 0x20 +int poll( struct pollfd *fds, unsigned int count, int timeout ); +#endif /* HAVE_POLL */ + #ifndef __REACTOS__ #ifndef HAVE_PREAD ssize_t pread( int fd, void *buf, size_t count, off_t offset );

1 0

[fireball] 42062: - Add two WineX11-specific mouse event flags. - Add an OEM specific VK code.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 21:15:34 2009 New Revision: 42062 URL: http://svn.reactos.org/svn/reactos?rev=42062&view=rev Log: - Add two WineX11-specific mouse event flags. - Add an OEM specific VK code. Modified: branches/arwinss/reactos/include/psdk/winuser.h Modified: branches/arwinss/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… ============================================================================== --- branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] Sat Jul 18 21:15:34 2009 @@ -1151,6 +1151,8 @@ #define MOUSEEVENTF_RIGHTUP 16 #define MOUSEEVENTF_MIDDLEDOWN 32 #define MOUSEEVENTF_MIDDLEUP 64 +#define MOUSEEVENTF_XDOWN 0x0080 +#define MOUSEEVENTF_XUP 0x0100 #define MOUSEEVENTF_WHEEL 0x0800 #define MOUSEEVENTF_ABSOLUTE 32768 #define PM_NOREMOVE 0 @@ -2208,6 +2210,7 @@ #define VK_F24 0x87 #define VK_NUMLOCK 0x90 #define VK_SCROLL 0x91 +#define VK_OEM_NEC_EQUAL 0x92 #define VK_LSHIFT 0xA0 #define VK_RSHIFT 0xA1 #define VK_LCONTROL 0xA2

1 0

[fireball] 42061: - Add winex11.drv to the build. - Import poll.c from wine/port.h. - Add supporting code in rosglue.c.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 21:07:50 2009 New Revision: 42061 URL: http://svn.reactos.org/svn/reactos?rev=42061&view=rev Log: - Add winex11.drv to the build. - Import poll.c from wine/port.h. - Add supporting code in rosglue.c. Added: branches/arwinss/reactos/dll/win32/winex11.drv/poll.c (with props) branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c (with props) branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild (with props) branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rc (with props) Modified: branches/arwinss/reactos/dll/win32/win32.rbuild Modified: branches/arwinss/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/win32… ============================================================================== --- branches/arwinss/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/win32.rbuild [iso-8859-1] Sat Jul 18 21:07:50 2009 @@ -574,6 +574,9 @@ <directory name="winemp3.acm"> <xi:include href="winemp3.acm/winemp3.acm.rbuild" /> </directory> +<directory name="winex11.drv"> + <xi:include href="winex11.drv/winex11.rbuild" /> +</directory> <directory name="winfax"> <xi:include href="winfax/winfax.rbuild" /> </directory> Added: branches/arwinss/reactos/dll/win32/winex11.drv/poll.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/poll.c (added) +++ branches/arwinss/reactos/dll/win32/winex11.drv/poll.c [iso-8859-1] Sat Jul 18 21:07:50 2009 @@ -1,0 +1,94 @@ +/* + * poll function + * + * Copyright 2008 Alexandre Julliard + * + * 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 "config.h" +#include "wine/port.h" + +#ifndef HAVE_POLL + +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + +/* we can't include winsock2.h here so we have to duplicate the definitions for Windows */ +#if defined(__MINGW32__) || defined(_MSC_VER) + +#define FD_SETSIZE 64 + +typedef struct +{ + unsigned int fd_count; + int fd_array[FD_SETSIZE]; /* an array of SOCKETs */ +} fd_set; + +#define FD_ZERO(set) ((set)->fd_count = 0) +#define FD_ISSET(fd, set) __WSAFDIsSet((fd), (set)) +#define FD_SET(fd, set) do { if ((set)->fd_count < FD_SETSIZE) (set)->fd_array[(set)->fd_count++]=(fd); } while(0) + +int __stdcall select(int,fd_set*,fd_set*,fd_set*,const struct timeval*); +int __stdcall __WSAFDIsSet(int,fd_set*); + +#endif + +int poll( struct pollfd *fds, unsigned int count, int timeout ) +{ + fd_set read_set, write_set, except_set; + unsigned int i; + int maxfd = -1, ret; + + FD_ZERO( &read_set ); + FD_ZERO( &write_set ); + FD_ZERO( &except_set ); + + for (i = 0; i < count; i++) + { + if (fds[i].fd == -1) continue; + if (fds[i].events & (POLLIN|POLLPRI)) FD_SET( fds[i].fd, &read_set ); + if (fds[i].events & POLLOUT) FD_SET( fds[i].fd, &write_set ); + FD_SET( fds[i].fd, &except_set ); /* POLLERR etc. are always selected */ + if (fds[i].fd > maxfd) maxfd = fds[i].fd; + } + if (timeout != -1) + { + struct timeval tv; + tv.tv_sec = timeout / 1000; + tv.tv_usec = timeout % 1000; + ret = select( maxfd + 1, &read_set, &write_set, &except_set, &tv ); + } + else ret = select( maxfd + 1, &read_set, &write_set, &except_set, NULL ); + + if (ret >= 0) + { + for (i = 0; i < count; i++) + { + fds[i].revents = 0; + if (fds[i].fd == -1) continue; + if (FD_ISSET( fds[i].fd, &read_set )) fds[i].revents |= POLLIN; + if (FD_ISSET( fds[i].fd, &write_set )) fds[i].revents |= POLLOUT; + if (FD_ISSET( fds[i].fd, &except_set )) fds[i].revents |= POLLERR; + } + } + return ret; +} + +#endif /* HAVE_POLL */ Propchange: branches/arwinss/reactos/dll/win32/winex11.drv/poll.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c (added) +++ branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c [iso-8859-1] Sat Jul 18 21:07:50 2009 @@ -1,0 +1,76 @@ +#include "config.h" + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "x11drv.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(x11glue); + +int usleep (unsigned int useconds) +{ + //return _usleep(useconds); + return 0; +} + +//void xinerama_init( unsigned int width, unsigned int height ) +//{ +//} + +WCHAR *wine_get_dos_file_name(char *path) +{ + ERR("wine_get_dos_file_name(%s) unimplemented!\n", path); + return NULL; +} + +/*********************************************************************** + * X11DRV_AttachEventQueueToTablet (X11DRV.@) + */ +int CDECL X11DRV_AttachEventQueueToTablet(HWND hOwner) +{ + return 0; +} + +/*********************************************************************** + * X11DRV_GetCurrentPacket (X11DRV.@) + */ +int CDECL X11DRV_GetCurrentPacket(void *packet) +{ + //*packet = gMsgPacket; + return 1; +} + +/*********************************************************************** + * X11DRV_LoadTabletInfo (X11DRV.@) + */ +void CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) +{ +} + +/*********************************************************************** + * X11DRV_WTInfoW (X11DRV.@) + */ +UINT CDECL X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) +{ + return FALSE; +} + +INT X11DRV_DCICommand(INT cbInput, const DCICMD *lpCmd, LPVOID lpOutData) +{ + TRACE("(%d,(%d,%d,%d),%p)\n", cbInput, lpCmd->dwCommand, + lpCmd->dwParam1, lpCmd->dwParam2, lpOutData); + + return FALSE; +} + +void X11DRV_DDHAL_SwitchMode(DWORD dwModeIndex, LPVOID fb_addr, LPVIDMEM fb_mem) +{ +} + Propchange: branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild (added) +++ branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild [iso-8859-1] Sat Jul 18 21:07:50 2009 @@ -1,0 +1,54 @@ +<module name="winex11" type="win32dll" baseaddress="${BASEADDRESS_SMDLL}" installbase="system32" installname="winex11.drv" allowwarnings="true"> + <importlibrary definition="winex11.drv.spec" /> + <include base="winex11">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="WINVER">0x0600</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__WINESRC__" /> + <file>bitblt.c</file> + <file>bitmap.c</file> + <file>brush.c</file> + <file>clipboard.c</file> + <file>codepage.c</file> + <file>desktop.c</file> + <file>dib.c</file> + <file>dib_convert.c</file> + <file>dib_dst_swap.c</file> + <file>dib_src_swap.c</file> + <file>event.c</file> + <file>graphics.c</file> + <file>ime.c</file> + <file>init.c</file> + <file>keyboard.c</file> + <file>mouse.c</file> + <file>opengl.c</file> + <file>palette.c</file> + <file>poll.c</file> + <file>pen.c</file> + <file>rosglue.c</file> + <file>scroll.c</file> + <file>settings.c</file> + <file>systray.c</file> + <file>text.c</file> + <file>window.c</file> + <file>x11drv_main.c</file> + <file>xdnd.c</file> + <file>xim.c</file> + <file>xfont.c</file> + <file>xinerama.c</file> + <file>xrender.c</file> + <file>xvidmode.c</file> + + <file>winex11.rc</file> + + <library>libX11</library> + <library>advapi32</library> + <library>wine</library> + <library>imm32</library> + <library>gdi32</library> + <library>user32</library> + <library>kernel32</library> + <library>ws2_32</library> + <library>ntdll</library> + <library>win32ksys</library> +</module> Propchange: branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rc (added) +++ branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rc [iso-8859-1] Sat Jul 18 21:07:50 2009 @@ -1,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS SM Helper\0" +#define REACTOS_STR_INTERNAL_NAME "smdll.dll\0" +#define REACTOS_STR_ORIGINAL_FILENAME "smdll.dll\0" +#include <reactos/version.rc> Propchange: branches/arwinss/reactos/dll/win32/winex11.drv/winex11.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