Ros-diffs December 2015

ros-diffs@reactos.org

12 participants
252 discussions

[tkreuzer] 70387: [WIN32K] Implement support for styled lines. CORE-9984 #resolve
by tkreuzer＠svn.reactos.org 17 Dec '15

17 Dec '15

Author: tkreuzer Date: Thu Dec 17 17:44:42 2015 New Revision: 70387 URL: http://svn.reactos.org/svn/reactos?rev=70387&view=rev Log: [WIN32K] Implement support for styled lines. CORE-9984 #resolve Modified: trunk/reactos/win32ss/gdi/eng/lineto.c trunk/reactos/win32ss/gdi/ntgdi/brush.h trunk/reactos/win32ss/gdi/ntgdi/pen.c Modified: trunk/reactos/win32ss/gdi/eng/lineto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/lineto.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/lineto.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/lineto.c [iso-8859-1] Thu Dec 17 17:44:42 2015 @@ -28,6 +28,63 @@ } } +LONG +HandleStyles( + BRUSHOBJ *pbo, + POINTL* Translate, + LONG x, + LONG y, + LONG deltax, + LONG deltay, + LONG dx, + LONG dy, + PULONG piStyle) +{ + PEBRUSHOBJ pebo = (PEBRUSHOBJ)pbo; + PULONG pulStyles = pebo->pbrush->pStyle; + ULONG iStyle, cStyles = pebo->pbrush->dwStyleCount; + LONG diStyle, offStyle, lStyleMax; + + if (cStyles > 0) + { + if (deltax > deltay) + { + offStyle = (x - Translate->x) % pebo->pbrush->ulStyleSize; + diStyle = dx; + lStyleMax = x; + } + else + { + offStyle = (y - Translate->y) % pebo->pbrush->ulStyleSize; + diStyle = dy; + lStyleMax = y; + } + + /* Now loop until we have found the style index */ + for (iStyle = 0; offStyle >= pulStyles[iStyle]; iStyle++) + { + offStyle -= pulStyles[iStyle]; + } + + if (diStyle > 0) + { + lStyleMax += pulStyles[iStyle] - offStyle; + } + else + { + lStyleMax -= offStyle + 1; + } + } + else + { + iStyle = 0; + lStyleMax = MAX_COORD; + } + + *piStyle = iStyle; + return lStyleMax; +} + /* * Draw a line from top-left to bottom-right */ @@ -43,6 +100,12 @@ RECT_ENUM RectEnum; ULONG Pixel = pbo->iSolidColor; LONG delta; + PEBRUSHOBJ pebo = (PEBRUSHOBJ)pbo; + PULONG pulStyles = pebo->pbrush->pStyle; + ULONG iStyle, cStyles = pebo->pbrush->dwStyleCount; + LONG lStyleMax; + + lStyleMax = HandleStyles(pbo, Translate, x, y, deltax, deltay, 1, 1, &iStyle); CLIPOBJ_cEnumStart(Clip, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0); EnumMore = CLIPOBJ_bEnum(Clip, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); @@ -72,7 +135,7 @@ } if (ClipRect < RectEnum.arcl + RectEnum.c) /* If there's no current clip rect we're done */ { - if (ClipRect->left <= x && ClipRect->top <= y) + if ((ClipRect->left <= x && ClipRect->top <= y) && ((iStyle & 1) == 0)) { DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_PutPixel( OutputObj, x, y, Pixel); @@ -80,6 +143,11 @@ if (deltax < deltay) { y++; + if (y == lStyleMax) + { + iStyle = (iStyle + 1) % cStyles; + lStyleMax = y + pulStyles[iStyle]; + } error = error + deltax; if (deltay <= error) { @@ -90,6 +158,11 @@ else { x++; + if (x == lStyleMax) + { + iStyle = (iStyle + 1) % cStyles; + lStyleMax = x + pulStyles[iStyle]; + } error = error + deltay; if (deltax <= error) { @@ -114,6 +187,12 @@ RECT_ENUM RectEnum; ULONG Pixel = pbo->iSolidColor; LONG delta; + PEBRUSHOBJ pebo = (PEBRUSHOBJ)pbo; + PULONG pulStyles = pebo->pbrush->pStyle; + ULONG iStyle, cStyles = pebo->pbrush->dwStyleCount; + LONG lStyleMax; + + lStyleMax = HandleStyles(pbo, Translate, x, y, deltax, deltay, 1, -1, &iStyle); CLIPOBJ_cEnumStart(Clip, FALSE, CT_RECTANGLES, CD_RIGHTUP, 0); EnumMore = CLIPOBJ_bEnum(Clip, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); @@ -142,7 +221,7 @@ } if (ClipRect < RectEnum.arcl + RectEnum.c) { - if (ClipRect->left <= x && y < ClipRect->bottom) + if ((ClipRect->left <= x && y < ClipRect->bottom) && ((iStyle & 1) == 0)) { DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_PutPixel( OutputObj, x, y, Pixel); @@ -150,6 +229,11 @@ if (deltax < deltay) { y--; + if (y == lStyleMax) + { + iStyle = (iStyle - 1) % cStyles; + lStyleMax = y - pulStyles[iStyle]; + } error = error + deltax; if (deltay <= error) { @@ -160,6 +244,11 @@ else { x++; + if (x == lStyleMax) + { + iStyle = (iStyle + 1) % cStyles; + lStyleMax = x + pulStyles[iStyle]; + } error = error + deltay; if (deltax <= error) { @@ -184,6 +273,12 @@ RECT_ENUM RectEnum; ULONG Pixel = pbo->iSolidColor; LONG delta; + PEBRUSHOBJ pebo = (PEBRUSHOBJ)pbo; + PULONG pulStyles = pebo->pbrush->pStyle; + ULONG iStyle, cStyles = pebo->pbrush->dwStyleCount; + LONG lStyleMax; + + lStyleMax = HandleStyles(pbo, Translate, x, y, deltax, deltay, -1, 1, &iStyle); CLIPOBJ_cEnumStart(Clip, FALSE, CT_RECTANGLES, CD_LEFTDOWN, 0); EnumMore = CLIPOBJ_bEnum(Clip, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); @@ -212,7 +307,7 @@ } if (ClipRect < RectEnum.arcl + RectEnum.c) { - if (x < ClipRect->right && ClipRect->top <= y) + if ((x < ClipRect->right && ClipRect->top <= y) && ((iStyle & 1) == 0)) { DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_PutPixel( OutputObj, x, y, Pixel); @@ -220,6 +315,11 @@ if (deltax < deltay) { y++; + if (y == lStyleMax) + { + iStyle = (iStyle + 1) % cStyles; + lStyleMax = y + pulStyles[iStyle]; + } error = error + deltax; if (deltay <= error) { @@ -230,6 +330,11 @@ else { x--; + if (x == lStyleMax) + { + iStyle = (iStyle - 1) % cStyles; + lStyleMax = x - pulStyles[iStyle]; + } error = error + deltay; if (deltax <= error) { @@ -254,6 +359,12 @@ RECT_ENUM RectEnum; ULONG Pixel = pbo->iSolidColor; LONG delta; + PEBRUSHOBJ pebo = (PEBRUSHOBJ)pbo; + PULONG pulStyles = pebo->pbrush->pStyle; + ULONG iStyle, cStyles = pebo->pbrush->dwStyleCount; + LONG lStyleMax; + + lStyleMax = HandleStyles(pbo, Translate, x, y, deltax, deltay, -1, -1, &iStyle); CLIPOBJ_cEnumStart(Clip, FALSE, CT_RECTANGLES, CD_LEFTUP, 0); EnumMore = CLIPOBJ_bEnum(Clip, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); @@ -282,7 +393,7 @@ } if (ClipRect < RectEnum.arcl + RectEnum.c) { - if (x < ClipRect->right && y < ClipRect->bottom) + if ((x < ClipRect->right && y < ClipRect->bottom) && ((iStyle & 1) == 0)) { DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_PutPixel( OutputObj, x, y, Pixel); @@ -290,6 +401,11 @@ if (deltax < deltay) { y--; + if (y == lStyleMax) + { + iStyle = (iStyle - 1) % cStyles; + lStyleMax = y - pulStyles[iStyle]; + } error = error + deltax; if (deltay <= error) { @@ -300,6 +416,11 @@ else { x--; + if (x == lStyleMax) + { + iStyle = (iStyle - 1) % cStyles; + lStyleMax = x - pulStyles[iStyle]; + } error = error + deltay; if (deltax <= error) { @@ -337,6 +458,8 @@ RECT_ENUM RectEnum; BOOL EnumMore; CLIPOBJ *pcoPriv = NULL; + PEBRUSHOBJ pebo = (PEBRUSHOBJ)pbo; + ULONG cStyles = pebo->pbrush->dwStyleCount; if (x1 < x2) { @@ -413,7 +536,7 @@ vy = y1; } - if (y1 == y2) + if ((y1 == y2) && (cStyles == 0)) { CLIPOBJ_cEnumStart(Clip, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0); do @@ -437,7 +560,7 @@ } while (EnumMore); } - else if (x1 == x2) + else if ((x1 == x2) && (cStyles == 0)) { CLIPOBJ_cEnumStart(Clip, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0); do Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] Thu Dec 17 17:44:42 2015 @@ -43,7 +43,8 @@ INT iBrushStyle; // 0x070 //PREGION prgn; // 0x074 //DWORD unk078; // 0x078 - DWORD unk07c; // 0x07c + //DWORD unk07c; // 0x07c + ULONG ulStyleSize; LIST_ENTRY ListHead; // 0x080 } BRUSHBODY; Modified: trunk/reactos/win32ss/gdi/ntgdi/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/pen.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] Thu Dec 17 17:44:42 2015 @@ -86,11 +86,12 @@ { HPEN hPen; PBRUSH pbrushPen; - static const BYTE PatternAlternate[] = {0x55, 0x55, 0x55, 0}; - static const BYTE PatternDash[] = {0xFF, 0xFF, 0xC0, 0}; - static const BYTE PatternDot[] = {0xE3, 0x8E, 0x38, 0}; - static const BYTE PatternDashDot[] = {0xFF, 0x81, 0xC0, 0}; - static const BYTE PatternDashDotDot[] = {0xFF, 0x8E, 0x38, 0}; + static ULONG aulStyleAlternate[] = { 1, 1 }; + static ULONG aulStyleDash[] = { 6, 2 }; + static ULONG aulStyleDot[] = { 1, 1 }; + static ULONG aulStyleDashDot[] = { 3, 2, 1, 2 }; + static ULONG aulStyleDashDotDot[] = { 3, 1, 1, 1, 1, 1 }; + ULONG i; dwWidth = abs(dwWidth); @@ -128,7 +129,8 @@ // FIXME: Copy the bitmap first ? pbrushPen->hbmClient = (HANDLE)ulClientHatch; pbrushPen->dwStyleCount = dwStyleCount; - pbrushPen->pStyle = pStyle; + pbrushPen->pStyle = NULL; + pbrushPen->ulStyleSize = 0; pbrushPen->flAttrs = bOldStylePen ? BR_IS_OLDSTYLEPEN : BR_IS_PEN; @@ -150,28 +152,33 @@ break; case PS_ALTERNATE: - pbrushPen->flAttrs |= BR_IS_BITMAP; - pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternAlternate); + pbrushPen->flAttrs |= BR_IS_SOLID; + pbrushPen->pStyle = aulStyleAlternate; + pbrushPen->dwStyleCount = _countof(aulStyleAlternate); break; case PS_DOT: - pbrushPen->flAttrs |= BR_IS_BITMAP; - pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDot); + pbrushPen->flAttrs |= BR_IS_SOLID; + pbrushPen->pStyle = aulStyleDot; + pbrushPen->dwStyleCount = _countof(aulStyleDot); break; case PS_DASH: - pbrushPen->flAttrs |= BR_IS_BITMAP; - pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDash); + pbrushPen->flAttrs |= BR_IS_SOLID; + pbrushPen->pStyle = aulStyleDash; + pbrushPen->dwStyleCount = _countof(aulStyleDash); break; case PS_DASHDOT: - pbrushPen->flAttrs |= BR_IS_BITMAP; - pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDot); + pbrushPen->flAttrs |= BR_IS_SOLID; + pbrushPen->pStyle = aulStyleDashDot; + pbrushPen->dwStyleCount = _countof(aulStyleDashDot); break; case PS_DASHDOTDOT: - pbrushPen->flAttrs |= BR_IS_BITMAP; - pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDotDot); + pbrushPen->flAttrs |= BR_IS_SOLID; + pbrushPen->pStyle = aulStyleDashDotDot; + pbrushPen->dwStyleCount = _countof(aulStyleDashDotDot); break; case PS_INSIDEFRAME: @@ -203,12 +210,22 @@ } } /* FIXME: What style here? */ - pbrushPen->flAttrs |= 0; + pbrushPen->flAttrs |= BR_IS_SOLID; + pbrushPen->dwStyleCount = dwStyleCount; + pbrushPen->pStyle = pStyle; break; default: DPRINT1("IntGdiExtCreatePen unknown penstyle %x\n", dwPenStyle); goto ExitCleanup; + } + + if (pbrushPen->pStyle != NULL) + { + for (i = 0; i < pbrushPen->dwStyleCount; i++) + { + pbrushPen->ulStyleSize += pbrushPen->pStyle[i]; + } } PEN_UnlockPen(pbrushPen);

1 0

[akhaldi] 70386: [0.4.0] * Merge rundll32 icon by Jared Smudde in r70384. CORE-10669
by akhaldi＠svn.reactos.org 17 Dec '15

17 Dec '15

Author: akhaldi Date: Thu Dec 17 17:08:25 2015 New Revision: 70386 URL: http://svn.reactos.org/svn/reactos?rev=70386&view=rev Log: [0.4.0] * Merge rundll32 icon by Jared Smudde in r70384. CORE-10669 Added: branches/ros-branch-0_4_0/reactos/base/system/rundll32/res/ - copied from r70384, trunk/reactos/base/system/rundll32/res/ Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/base/system/rundll32/resource.h branches/ros-branch-0_4_0/reactos/base/system/rundll32/rundll32.rc Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 17 17:08:25 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381 +/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 17 17:08:25 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384 Modified: branches/ros-branch-0_4_0/reactos/base/system/rundll32/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/system/rundll32/resource.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/system/rundll32/resource.h [iso-8859-1] Thu Dec 17 17:08:25 2015 @@ -3,3 +3,5 @@ #define RC_STRING_MAX_SIZE 200 #define IDS_DllNotLoaded 100 #define IDS_MissingEntry 101 + +#define IDI_MAIN 100 Modified: branches/ros-branch-0_4_0/reactos/base/system/rundll32/rundll32.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/system/rundll32/rundll32.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/system/rundll32/rundll32.rc [iso-8859-1] Thu Dec 17 17:08:25 2015 @@ -6,6 +6,8 @@ #define REACTOS_STR_INTERNAL_NAME "rundll32" #define REACTOS_STR_ORIGINAL_FILENAME "rundll32.exe" #include <reactos/version.rc> + +IDI_MAIN ICON "res/main.ico" /* UTF-8 */ #pragma code_page(65001)

1 0

[rnaumann] 70385: [HIVECLS] Add bmp images to the shell "new" menu. Patch by Jared Smudde CORE-10668
by rnaumann＠svn.reactos.org 17 Dec '15

17 Dec '15

Author: rnaumann Date: Thu Dec 17 14:23:21 2015 New Revision: 70385 URL: http://svn.reactos.org/svn/reactos?rev=70385&view=rev Log: [HIVECLS] Add bmp images to the shell "new" menu. Patch by Jared Smudde CORE-10668 Modified: trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Thu Dec 17 14:23:21 2015 @@ -177,6 +177,8 @@ ; Bitmap Images HKCR,".bmp","",0x00000000,"bmpfile" HKCR,"bmpfile","",0x00000000,"Bitmap Image" +HKCR,".bmp\shellnew","",0x00000000,"" +HKCR,".bmp\shellnew","NullFile",0x00020000,"" HKCR,"bmpfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shimgvw.dll,-304" HKCR,"bmpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,1" HKCR,"bmpfile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1"

1 0

[rnaumann] 70384: [RUNDLL32] Add an icon. Patch by Jared Smudde. CORE-10669
by rnaumann＠svn.reactos.org 17 Dec '15

17 Dec '15

Author: rnaumann Date: Thu Dec 17 14:10:18 2015 New Revision: 70384 URL: http://svn.reactos.org/svn/reactos?rev=70384&view=rev Log: [RUNDLL32] Add an icon. Patch by Jared Smudde. CORE-10669 Added: trunk/reactos/base/system/rundll32/res/ trunk/reactos/base/system/rundll32/res/main.ico (with props) Modified: trunk/reactos/base/system/rundll32/resource.h trunk/reactos/base/system/rundll32/rundll32.rc Added: trunk/reactos/base/system/rundll32/res/main.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/res/m… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/system/rundll32/res/main.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/system/rundll32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/resou… ============================================================================== --- trunk/reactos/base/system/rundll32/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/system/rundll32/resource.h [iso-8859-1] Thu Dec 17 14:10:18 2015 @@ -3,3 +3,5 @@ #define RC_STRING_MAX_SIZE 200 #define IDS_DllNotLoaded 100 #define IDS_MissingEntry 101 + +#define IDI_MAIN 100 Modified: trunk/reactos/base/system/rundll32/rundll32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… ============================================================================== --- trunk/reactos/base/system/rundll32/rundll32.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/rundll32/rundll32.rc [iso-8859-1] Thu Dec 17 14:10:18 2015 @@ -6,6 +6,8 @@ #define REACTOS_STR_INTERNAL_NAME "rundll32" #define REACTOS_STR_ORIGINAL_FILENAME "rundll32.exe" #include <reactos/version.rc> + +IDI_MAIN ICON "res/main.ico" /* UTF-8 */ #pragma code_page(65001)

1 0

[akhaldi] 70383: [0.4.0] * Merge the Traditional Chinese translation update by Henry Tang Ih in 70381. CORE-10655
by akhaldi＠svn.reactos.org 17 Dec '15

17 Dec '15

Author: akhaldi Date: Thu Dec 17 11:16:39 2015 New Revision: 70383 URL: http://svn.reactos.org/svn/reactos?rev=70383&view=rev Log: [0.4.0] * Merge the Traditional Chinese translation update by Henry Tang Ih in 70381. CORE-10655 Added: branches/ros-branch-0_4_0/reactos/boot/freeldr/fdebug/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/boot/freeldr/fdebug/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/shellext/deskadp/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/shellext/deskadp/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/shellext/deskmon/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/shellext/deskmon/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/shellext/ntobjshex/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/shellext/ntobjshex/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/shellext/slayer/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/shellext/slayer/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/shellext/stobject/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/shellext/stobject/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/win32/aclui/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/win32/aclui/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/win32/browseui/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/win32/browseui/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/win32/devmgr/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/win32/devmgr/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/win32/ieframe/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/win32/ieframe/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/win32/lsasrv/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/win32/lsasrv/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/win32/msgina/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/win32/msgina/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/win32/msports/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/win32/msports/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/win32/mycomput/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/win32/mycomput/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/win32/netcfgx/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/win32/netcfgx/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/win32/netid/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/win32/netid/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/win32/newdev/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/win32/newdev/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/win32/samsrv/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/win32/samsrv/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/win32/serialui/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/win32/serialui/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/win32/setupapi/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/win32/setupapi/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/win32/shimgvw/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/win32/shimgvw/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/win32/syssetup/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/win32/syssetup/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/win32/tapiui/lang/zh-TW.rc - copied unchanged from r70381, trunk/reactos/dll/win32/tapiui/lang/zh-TW.rc Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/base/shell/explorer/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/boot/freeldr/fdebug/fdebug.rc branches/ros-branch-0_4_0/reactos/dll/shellext/deskadp/deskadp.rc branches/ros-branch-0_4_0/reactos/dll/shellext/deskmon/deskmon.rc branches/ros-branch-0_4_0/reactos/dll/shellext/netshell/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/shellext/ntobjshex/ntobjshex.rc branches/ros-branch-0_4_0/reactos/dll/shellext/slayer/slayer.rc branches/ros-branch-0_4_0/reactos/dll/shellext/stobject/stobject.rc branches/ros-branch-0_4_0/reactos/dll/win32/aclui/aclui.rc branches/ros-branch-0_4_0/reactos/dll/win32/browseui/browseui.rc branches/ros-branch-0_4_0/reactos/dll/win32/devmgr/devmgr.rc branches/ros-branch-0_4_0/reactos/dll/win32/ieframe/ieframe.rc branches/ros-branch-0_4_0/reactos/dll/win32/lsasrv/lsasrv.rc branches/ros-branch-0_4_0/reactos/dll/win32/msgina/msgina.rc branches/ros-branch-0_4_0/reactos/dll/win32/msports/msports.rc branches/ros-branch-0_4_0/reactos/dll/win32/mycomput/mycomput.rc branches/ros-branch-0_4_0/reactos/dll/win32/netcfgx/netcfgx.rc branches/ros-branch-0_4_0/reactos/dll/win32/netid/netid.rc branches/ros-branch-0_4_0/reactos/dll/win32/newdev/newdev.rc branches/ros-branch-0_4_0/reactos/dll/win32/samsrv/samsrv.rc branches/ros-branch-0_4_0/reactos/dll/win32/serialui/serialui.rc branches/ros-branch-0_4_0/reactos/dll/win32/setupapi/setupapi.rc branches/ros-branch-0_4_0/reactos/dll/win32/shimgvw/shimgvw.rc branches/ros-branch-0_4_0/reactos/dll/win32/syssetup/lang/zh-CN.rc branches/ros-branch-0_4_0/reactos/dll/win32/tapiui/tapiui.rc Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 17 11:16:39 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378 +/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 17 11:16:39 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381 Modified: branches/ros-branch-0_4_0/reactos/base/shell/explorer/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/shell/explorer/lang/zh-TW.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/shell/explorer/lang/zh-TW.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -82,10 +82,10 @@ AUTOCHECKBOX "ä½¿å·¥ä½åé¡¯ç¤ºå¨æä¸å±¤(&T)", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "åä½µé¡ä¼¼çå·¥ä½åæé(&G)", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "é¡¯ç¤ºå¿«éåå(&Q)", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 98 + GROUPBOX "éç¥åå", IDC_STATIC, 6, 114, 240, 98 CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13, 126, 223, 28 AUTOCHECKBOX "å°æé(&K)", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED + AUTOCHECKBOX "é¡¯ç¤ºç§", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED LTEXT "æ¨å¯ä»¥é±èæè¿æ²æé¸åéçåç¤ºä»¥ä¿æéç¥ååæ´æ½ã", IDC_STATIC, 13, 169, 223, 16 AUTOCHECKBOX "é±èéä½¿ç¨ä¸çåç¤º(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 PUSHBUTTON "èªè¨(&C)...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 @@ -108,88 +108,88 @@ IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP -CAPTION "Customize Notifications" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "ReactOS displays icons for active and urgent notifications, and hides inactive ones. You can change this behavior for items in the list below.", IDC_STATIC, 6, 6, 220, 30 - LTEXT "Select an item, then choose its notification behavior:", IDC_STATIC, 6, 40, 220, 10 +CAPTION "èªè¨éç¥" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS é¡¯ç¤ºåç¤ºçºæ´»èºåç·æ¥éç¥ï¼ä¸¦é±èä¸æ´»åçãæ¨å¯ä»¥æ´æ¹æ¤è¡çºä¸é¢æ¸å®ä¸çå°æ¡ã", IDC_STATIC, 6, 6, 220, 30 + LTEXT "é¸æä¸åå°æ¡ï¼ç¶å¾é¸æå®çéç¥è¡çº:", IDC_STATIC, 6, 40, 220, 10 CONTROL "", IDC_NOTIFICATION_LIST, "SysListView32", WS_CLIPSIBLINGS | WS_BORDER | 0x00008005, 6, 50, 220, 128 COMBOBOX IDC_NOTIFICATION_BEHAVIOUR, 103, 178, 78, 200, CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_CLIPSIBLINGS - PUSHBUTTON "&Restore Defaults", IDC_TASKBARPROP_NOTIREST, 164, 188, 62, 14 - DEFPUSHBUTTON "OK", IDOK, 122, 220, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 176, 220, 50, 14 + PUSHBUTTON "éåé è¨å¼(&R)", IDC_TASKBARPROP_NOTIREST, 164, 188, 62, 14 + DEFPUSHBUTTON "ç¢ºå®", IDOK, 122, 220, 50, 14 + PUSHBUTTON "åæ¶", IDCANCEL, 176, 220, 50, 14 END IDD_CLASSICSTART_CUSTOMIZE DIALOGEX 0, 0, 232, 240, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Customize Classic Start Menu" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Start menu", IDC_STATIC, 8, 7, 218, 114 +CAPTION "èªå®ç¾©ç¶å¸éå§é¸å®" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "éå§é¸å®", IDC_STATIC, 8, 7, 218, 114 ICON IDI_STARTMENU2, IDC_STATIC, 19, 17, 20, 20 - LTEXT "You can customize your Start menu by adding or removing items.", IDC_STATIC, 48, 17, 108, 39 - PUSHBUTTON "A&dd...", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 - PUSHBUTTON "&Remove...", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 - PUSHBUTTON "Ad&vanced", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 - PUSHBUTTON "&Sort", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 + LTEXT "ä½ å¯ä»¥ééæ·»å æç§»é¤é èªå®ç¾©éå§é¸å®ã", IDC_STATIC, 48, 17, 108, 39 + PUSHBUTTON "æ·»å ...(&D)", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 + PUSHBUTTON "åªé¤...(&R)", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 + PUSHBUTTON "é«é(&V)", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 + PUSHBUTTON "æåº(&S)", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 ICON IDI_RECYCLEBIN, IDC_STATIC, 20, 85, 20, 20 - LTEXT "To remove records of recently accessed documents, programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33 - PUSHBUTTON "&Clear", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 - LTEXT "Advanced S&tart menu options:", IDC_STATIC, 8, 129, 150, 8 - CONTROL "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, "SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE - DEFPUSHBUTTON "OK", IDOK, 122, 220, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 176, 220, 50, 14 + LTEXT "è¦åªé¤æè¿è¨ªåéçæªæ¡ã ç¨å¼åç¶²ç«é»è¨éï¼å®ææ¸é¤ã", IDC_STATIC, 49, 85, 108, 33 + PUSHBUTTON "æ¸é¤(&C)", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 + LTEXT "éå§é¸å®ä¸çé«éçé¸é :(&T)", IDC_STATIC, 8, 129, 150, 8 + CONTROL "éå§é¸å®è¨å®(&T)", IDC_CLASSICSTART_SETTINGS, "SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE + DEFPUSHBUTTON "ç¢ºå®", IDOK, 122, 220, 50, 14 + PUSHBUTTON "åæ¶", IDCANCEL, 176, 220, 50, 14 } IDD_FILENAME_WARNING DIALOGEX 0, 0, 272, 81, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_DLGFRAME -CAPTION "File Name Warning" -FONT 8, "MS Shell Dlg" -{ - DEFPUSHBUTTON "&Ignore", IDIGNORE, 215, 60, 50, 14 - PUSHBUTTON "&Rename", IDC_FILE_RENAME, 159, 60, 50, 14 +CAPTION "æªåç¨±è¦å" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "å¿½ç¥(&I)", IDIGNORE, 215, 60, 50, 14 + PUSHBUTTON "éæ°å½å(&R)", IDC_FILE_RENAME, 159, 60, 50, 14 LTEXT "", IDC_STATIC, 7, 51, 258, 1, NOT WS_GROUP - AUTOCHECKBOX "&Don't perform this check at startup", IDC_NOTCHECK, 7, 62, 139, 10 + AUTOCHECKBOX "ä¸å·è¡æ¤æª¢æ¥ååæ(&D)", IDC_NOTCHECK, 7, 62, 139, 10 ICON 32515, IDC_STATIC, 7, 7, 21, 20 - LTEXT "There is a file or folder on your computer called %s which could cause certain applications to not function correctly. Renaming it to %s would solve this problem. Would you like to rename it now?", IDC_STATIC, 34, 7, 224, 37 + LTEXT "ææ¯ä¸åæªæ¡æè³æå¤¾å¨æ¨çè¨ç®æ©è¢«ç¨±çº %s éå¯è½æå°è´æäºæç¨ç¨å¼ä¸è½å¤ æ£ç¢ºãéæ°å½åçº %s å°è§£æ±ºéååé¡ãæ¨æ³ç¾å¨éæ°å½åå®?", IDC_STATIC, 34, 7, 224, 37 } IDD_MODERNSTART_ADVANCED DIALOGEX 0, 0, 251, 198, 0 STYLE DS_SETFONT | WS_CAPTION | WS_CHILD | WS_DISABLED -CAPTION "Advanced" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Start menu settings ", IDC_STATIC, 7, 7, 238, 42 - AUTOCHECKBOX "&Open submenus when I pause on them with my mouse", IDC_AUTOOPEN, 14, 21, 224, 10 - AUTOCHECKBOX "Highlight &newly installed programs", IDC_HIGHLIGHT, 14, 35, 224, 10 - LTEXT "Start &menu items:", IDC_STATIC, 7, 53, 238, 8 - CONTROL "StartMenuSe&ttings", IDC_ITEMS, "SysTreeView32", WS_BORDER | 0x00000001, 7, 63, 238, 67, WS_EX_CLIENTEDGE - GROUPBOX "Recent documents ", IDC_STATIC, 7, 133, 238, 56 - LTEXT "Select this option to provide quick access to the documents you opened most recently. Clearing this list does not delete the documents.", IDC_STATIC, 14, 144, 224, 21 - AUTOCHECKBOX "List my most &recently opened documents", IDC_RECENTLY, 14, 168, 147, 10 - PUSHBUTTON "&Clear List", IDC_CLEAR, 182, 168, 55, 14 +CAPTION "é«é" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "éå§é¸å®è¨å® ", IDC_STATIC, 7, 7, 238, 42 + AUTOCHECKBOX "èæçæ»é¼ ä¸ä»åæ«åæéååé¸å®(&O)", IDC_AUTOOPEN, 14, 21, 224, 10 + AUTOCHECKBOX "çªåºé¡¯ç¤ºæ°å®è£çç¨å¼(&N)", IDC_HIGHLIGHT, 14, 35, 224, 10 + LTEXT "éå§é¸å®é :(&M)", IDC_STATIC, 7, 53, 238, 8 + CONTROL "éå§é¸å®è¨å®(&T)", IDC_ITEMS, "SysTreeView32", WS_BORDER | 0x00000001, 7, 63, 238, 67, WS_EX_CLIENTEDGE + GROUPBOX "æè¿ä½¿ç¨çæªæ¡ ", IDC_STATIC, 7, 133, 238, 56 + LTEXT "é¸ææ¤é¸é ä¾æä¾å°æ¨æè¿éåçæªæ¡çå¿«éè¨ªåãæ¸é¤æ¤åè¡¨ä¸¦ä¸æåªé¤æªæ¡ã", IDC_STATIC, 14, 144, 224, 21 + AUTOCHECKBOX "ååºææè¿éåçæªæ¡(&R)", IDC_RECENTLY, 14, 168, 147, 10 + PUSHBUTTON "æ¸é¤åè¡¨(&C)", IDC_CLEAR, 182, 168, 55, 14 } IDD_MODERNSTART_GENERAL DIALOGEX 0, 0, 251, 198 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_DLGFRAME -CAPTION "General" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Select an icon size for programs ", IDC_STATIC, 7, 7, 238, 37 +CAPTION "å¸¸è¦" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "é¸æç¨å¼åç¤ºå¤§å° ", IDC_STATIC, 7, 7, 238, 37 ICON IDC_LARGEICON, 17, 18, 20, 20, SS_CENTERIMAGE ICON IDC_SMALLICON, 151, 18, 20, 20, SS_CENTERIMAGE - AUTORADIOBUTTON "&Large icons", IDC_CHOOSELARGE, 43, 25, 53, 10 - AUTORADIOBUTTON "&Small icons", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP - GROUPBOX "Programs ", IDC_STATIC, 7, 49, 238, 70 - LTEXT "The Start menu contains shortcuts to the programs you use most often. Clearing the list of shortcuts does not delete the programs.", IDC_STATIC, 14, 63, 224, 20 - LTEXT "&Number of programs on Start menu:", IDC_STATIC, 14, 86, 112, 8 + AUTORADIOBUTTON "å¤§åç¤º(&L)", IDC_CHOOSELARGE, 43, 25, 53, 10 + AUTORADIOBUTTON "å°åç¤º(&S)", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP + GROUPBOX "ç¨å¼ ", IDC_STATIC, 7, 49, 238, 70 + LTEXT "éå§é¸å®åå«æ¨æå¸¸ä½¿ç¨çç¨å¼çå¿«æ·æ¹å¼ãæ¸é¤å¿«æ·æ¹å¼çåè¡¨ä¸¦ä¸æåªé¤ç¨å¼ã", IDC_STATIC, 14, 63, 224, 20 + LTEXT "éå§é¸å®ä¸çç¨å¼çæ¸ç®:(&N)", IDC_STATIC, 14, 86, 112, 8 EDITTEXT IDC_NUMBEROFPROGRAMS, 133, 84, 27, 12, ES_LEFT | ES_RIGHT | ES_NUMBER CONTROL "", IDC_NUMBERUPDOWN, "msctls_updown32", WS_BORDER | 0x000000B6, 160, 84, 11, 12 - PUSHBUTTON "&Clear List", IDC_CLEARLIST, 182, 98, 57, 14 - GROUPBOX "Show on Start menu ", IDC_STATIC, 7, 126, 238, 63 - AUTOCHECKBOX "&Internet:", IDC_SHOWINTERNET, 14, 140, 42, 10 + PUSHBUTTON "æ¸é¤åè¡¨(&C)", IDC_CLEARLIST, 182, 98, 57, 14 + GROUPBOX "å¨éå§é¸å®ä¸é¡¯ç¤º ", IDC_STATIC, 7, 126, 238, 63 + AUTOCHECKBOX "ç¶²éç¶²è·¯:(&I)", IDC_SHOWINTERNET, 14, 140, 42, 10 COMBOBOX IDC_INTERNETDEFAULTAPP, 98, 138, 140, 200, CBS_DROPDOWNLIST | WS_VSCROLL - AUTOCHECKBOX "&E-mail:", IDC_SHOWEMAIL, 14, 157, 37, 10 + AUTOCHECKBOX "é»åéµä»¶:(&E)", IDC_SHOWEMAIL, 14, 157, 37, 10 COMBOBOX IDC_EMAILDEFAULTAPP, 98, 155, 140, 200, CBS_DROPDOWNLIST | WS_VSCROLL } Modified: branches/ros-branch-0_4_0/reactos/boot/freeldr/fdebug/fdebug.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/boot/f… ============================================================================== --- branches/ros-branch-0_4_0/reactos/boot/freeldr/fdebug/fdebug.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/boot/freeldr/fdebug/fdebug.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -72,3 +72,6 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Modified: branches/ros-branch-0_4_0/reactos/dll/shellext/deskadp/deskadp.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/sh… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/shellext/deskadp/deskadp.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/shellext/deskadp/deskadp.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -73,3 +73,6 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Modified: branches/ros-branch-0_4_0/reactos/dll/shellext/deskmon/deskmon.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/sh… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/shellext/deskmon/deskmon.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/shellext/deskmon/deskmon.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -73,3 +73,6 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Modified: branches/ros-branch-0_4_0/reactos/dll/shellext/netshell/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/sh… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/shellext/netshell/lang/zh-TW.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/shellext/netshell/lang/zh-TW.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -22,9 +22,9 @@ PUSHBUTTON "è§£é¤å®è£(&U)", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "å±¬æ§(&P)", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "æè¿°", -1, 9, 153, 230, 46, BS_GROUPBOX - LTEXT "Component Description goes here...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + LTEXT "åä»¶æè¿°å¨æ¤è...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP CHECKBOX "é£æ¥å¾å¨éç¥ååé¡¯ç¤ºåç¤º", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "å¨é£æ¥&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "å¨é£æ¥éç¥æææ¤é£æ¥åéå¶æç¡é£æ¥(&N)", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 @@ -41,17 +41,17 @@ BEGIN GROUPBOX "é£æ¥", -1, 9, 8, 182, 58, BS_GROUPBOX LTEXT "çæ:", -1, 19, 20, 60, 8 - LTEXT "Duration:", -1, 19, 34, 60, 8 + LTEXT "æçºæé:", -1, 19, 34, 60, 8 LTEXT "éåº¦:", -1, 19, 48, 60, 8 - GROUPBOX "Activity", -1, 9, 74, 182, 70, BS_GROUPBOX + GROUPBOX "æ´»å", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "å³é", -1, 26, 90, 60, 8 ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT "æ¥æ¶", -1, 149, 90, 37, 8 LTEXT "ä½åçµ:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "&Properties", IDC_PROPERTIES, 10, 150, 50, 14 - PUSHBUTTON "&Disable", IDC_ENDISABLE, 66, 150, 50, 14 + PUSHBUTTON "å±¬æ§(&P)", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "ç¦ç¨(&D)", IDC_ENDISABLE, 66, 150, 50, 14 RTEXT "", IDC_STATUS, 83, 20, 98, 8 RTEXT "", IDC_DURATION, 83, 34, 98, 8 RTEXT "", IDC_SPEED, 83, 48, 98, 8 @@ -59,7 +59,7 @@ IDD_LAN_NETSTATUSADVANCED DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Support" +CAPTION "ç¶æ" FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "é£æ¥çæ", -1, 9, 8, 190, 88, BS_GROUPBOX @@ -91,20 +91,20 @@ IDS_SUBNET_MASK "åç¶²çµ¡é®ç½©" IDS_DEF_GATEWAY "é è¨éé" IDS_DHCP_SERVER "DHCP ä¼ºæå¨" - IDS_LEASE_OBTAINED "Lease Obtained" - IDS_LEASE_EXPIRES "Lease Expires" + IDS_LEASE_OBTAINED "ç²å¾äºç§ç´" + IDS_LEASE_EXPIRES "ç§ç´éæ" IDS_DNS_SERVERS "DNS ä¼ºæå¨" IDS_WINS_SERVERS "WINS ä¼ºæå¨" - IDS_PROPERTY "Property" + IDS_PROPERTY "å±¬æ§" IDS_VALUE "å¼" IDS_NETWORKCONNECTION "ç¶²è·¯é£ç·" IDS_SHV_COLUMN_NAME "åç¨±" IDS_SHV_COLUMN_TYPE "é¡å" IDS_SHV_COLUMN_STATE "çæ" IDS_SHV_COLUMN_DEVNAME "è£ç½®åç¨±" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" - IDS_TYPE_ETHERNET "LAN or High-Speed Internet" + IDS_SHV_COLUMN_PHONE "é»è©± # æä¸»æ©ä½å" + IDS_SHV_COLUMN_OWNER "ææè" + IDS_TYPE_ETHERNET "å±åç¶²æé«éäºè¯ç¶²" IDS_STATUS_NON_OPERATIONAL "åç¨" IDS_STATUS_UNREACHABLE "æªè¿æ¥" IDS_STATUS_DISCONNECTED "ç¶²çµ¡çºç·å·²æé¤" Modified: branches/ros-branch-0_4_0/reactos/dll/shellext/ntobjshex/ntobjshex.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/sh… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/shellext/ntobjshex/ntobjshex.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/shellext/ntobjshex/ntobjshex.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -58,3 +58,7 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif + +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Modified: branches/ros-branch-0_4_0/reactos/dll/shellext/slayer/slayer.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/sh… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/shellext/slayer/slayer.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/shellext/slayer/slayer.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -80,3 +80,6 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Modified: branches/ros-branch-0_4_0/reactos/dll/shellext/stobject/stobject.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/sh… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -55,3 +55,6 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Modified: branches/ros-branch-0_4_0/reactos/dll/win32/aclui/aclui.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/aclui/aclui.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/aclui/aclui.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -86,3 +86,6 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Modified: branches/ros-branch-0_4_0/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -98,3 +98,6 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Modified: branches/ros-branch-0_4_0/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/devmgr/devmgr.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/devmgr/devmgr.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -86,4 +86,7 @@ #endif #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" -#endif +#endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Modified: branches/ros-branch-0_4_0/reactos/dll/win32/ieframe/ieframe.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -59,6 +59,10 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif + LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL Modified: branches/ros-branch-0_4_0/reactos/dll/win32/lsasrv/lsasrv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/lsasrv/lsasrv.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/lsasrv/lsasrv.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -42,3 +42,6 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -75,4 +75,8 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif + Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msports/msports.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/msports/msports.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/msports/msports.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -55,3 +55,6 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Modified: branches/ros-branch-0_4_0/reactos/dll/win32/mycomput/mycomput.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/mycomput/mycomput.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/mycomput/mycomput.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -41,4 +41,7 @@ #endif #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" -#endif +#endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Modified: branches/ros-branch-0_4_0/reactos/dll/win32/netcfgx/netcfgx.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/netcfgx/netcfgx.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/netcfgx/netcfgx.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -92,3 +92,6 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Modified: branches/ros-branch-0_4_0/reactos/dll/win32/netid/netid.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/netid/netid.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/netid/netid.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -80,3 +80,6 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Modified: branches/ros-branch-0_4_0/reactos/dll/win32/newdev/newdev.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/newdev/newdev.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/newdev/newdev.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -82,3 +82,6 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Modified: branches/ros-branch-0_4_0/reactos/dll/win32/samsrv/samsrv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/samsrv/samsrv.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/samsrv/samsrv.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -52,4 +52,7 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Modified: branches/ros-branch-0_4_0/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/serialui/serialui.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/serialui/serialui.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -66,3 +66,6 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Modified: branches/ros-branch-0_4_0/reactos/dll/win32/setupapi/setupapi.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/setupapi/setupapi.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/setupapi/setupapi.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -111,3 +111,6 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Modified: branches/ros-branch-0_4_0/reactos/dll/win32/shimgvw/shimgvw.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/shimgvw/shimgvw.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/shimgvw/shimgvw.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -78,3 +78,6 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Modified: branches/ros-branch-0_4_0/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -124,7 +124,7 @@ STRINGTABLE BEGIN IDS_ACKTITLE "è´è°¢" - IDS_ACKSUBTITLE "ReactOS çè©ä¸ç«å¨åè®¸å¯è¯ä¿¡æ¯" + IDS_ACKSUBTITLE "ReactOS æä¾èµçå¼æºé¡¹ç®åå¶è®¸å¯è¯ä¿¡æ¯" IDS_OWNERTITLE "èªå®ä¹è½¯ä»¶" IDS_OWNERSUBTITLE "å®è£ç¨åºå°ä½¿ç¨æ¨æä¾çä¸ªäººä¿¡æ¯ï¼èªå®ä¹æ¨ç ReactOS è½¯ä»¶ã" IDS_COMPUTERTITLE "è®¡ç®æºååç³»ç»ç®¡çåå¯ç " Modified: branches/ros-branch-0_4_0/reactos/dll/win32/tapiui/tapiui.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/tapiui/tapiui.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/tapiui/tapiui.rc [iso-8859-1] Thu Dec 17 11:16:39 2015 @@ -55,3 +55,6 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif

1 0

[akhaldi] 70382: [0.4.0] * Merge the translation fixes to browseui and sysdm by Hermès in revisions 70375 => 70378.
by akhaldi＠svn.reactos.org 17 Dec '15

17 Dec '15

Author: akhaldi Date: Thu Dec 17 11:14:34 2015 New Revision: 70382 URL: http://svn.reactos.org/svn/reactos?rev=70382&view=rev Log: [0.4.0] * Merge the translation fixes to browseui and sysdm by Hermès in revisions 70375 => 70378. Added: branches/ros-branch-0_4_0/reactos/dll/win32/browseui/lang/fr-FR.rc - copied unchanged from r70378, trunk/reactos/dll/win32/browseui/lang/fr-FR.rc Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/boot/bootdata/hivedef.inf branches/ros-branch-0_4_0/reactos/dll/cpl/desk/lang/fr-FR.rc branches/ros-branch-0_4_0/reactos/dll/cpl/mmsys/lang/fr-FR.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/bg-BG.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/cs-CZ.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/da-DK.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/el-GR.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/en-US.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/es-ES.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/fr-FR.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/he-IL.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/hu-HU.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/id-ID.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/it-IT.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/ja-JP.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/nl-NL.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/no-NO.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/pl-PL.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/ro-RO.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/ru-RU.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/sk-SK.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/sq-AL.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/sv-SE.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/uk-UA.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/zh-CN.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/zh-TW.rc branches/ros-branch-0_4_0/reactos/dll/win32/browseui/browseui.rc branches/ros-branch-0_4_0/reactos/dll/win32/browseui/internettoolbar.cpp Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 17 11:14:34 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373 +/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 17 11:14:34 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378 Modified: branches/ros-branch-0_4_0/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_4_0/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -2414,7 +2414,7 @@ DESKTOP_SCHEME_19="Storm" DESKTOP_SCHEME_20="Teal" DESKTOP_SCHEME_21="Wheat" -DESKTOP_SCHEME_SIZE_0="Default size" +DESKTOP_SCHEME_SIZE_0="Taille par défaut" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -45,13 +45,13 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Visual Style", IDC_STATIC, 7, 130, 104, 9 + LTEXT "Style visuel", IDC_STATIC, 7, 130, 104, 9 COMBOBOX IDC_APPEARANCE_VISUAL_STYLE, 7, 140, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "ModÃ¨le de couleurs", IDC_STATIC, 7, 160, 104, 9 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 170, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Size", IDC_STATIC, 7, 190, 104, 9 + LTEXT "Taille", IDC_STATIC, 7, 190, 104, 9 COMBOBOX IDC_APPEARANCE_SIZE, 7, 200, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Effets...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/mmsys/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/mmsys/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/mmsys/lang/fr-FR.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -233,14 +233,14 @@ IDS_CPLNAME "Son et pÃ©riphÃ©riques audio" IDS_CPLDESCRIPTION "Change le modÃ¨le de sons de votre ordinateur, ou configure les paramÃ¨tres de vos hauts-parleurs et de vos pÃ©riphÃ©riques d'enregistrement." IDS_NO_SOUND "(Aucun)" - IDS_NO_DEVICES "No Devices" + IDS_NO_DEVICES "Aucun pÃ©riphÃ©rique" 5825 "Erreur programme" 5826 "Fermeture programme" 5827 "Alarme batterie critique" 5828 "Connexion pÃ©riphÃ©rique" 5829 "DÃ©connexion pÃ©riphÃ©rique" 5830 "Ãchec connexion pÃ©riphÃ©rique" - 5831 "CorbeillÃ© vidÃ©e" + 5831 "Corbeille vidÃ©e" 5832 "Alarme batterie faible" 5833 "Maximiser" 5834 "Commande menu" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -295,9 +295,9 @@ IDS_WARNMAXIMUMSIZE "ÐÑÐ²ÐµÐ´ÐµÑÐµ ÑÐ¸ÑÐ»ÐµÐ½Ð° ÑÑÐ¾Ð¹Ð½Ð¾ÑÑ Ð·Ð° Ð²ÑÑÑÐ¾Ð²Ð¸Ñ ÑÐ°Ð·Ð¼ÐµÑ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ¸Ñ ÑÐ°Ð¹Ð»." IDS_WARNINITIALRANGE "ÐÐ°ÑÐ°Ð»Ð½Ð¸ÑÑ ÑÐ°Ð·Ð¼ÐµÑ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ¸Ñ ÑÐ°Ð¹Ð» Ð½Ðµ ÑÑÑÐ±Ð²Ð° Ð´Ð° Ðµ Ð¿Ð¾-Ð¼Ð°Ð»ÑÐº Ð¾Ñ 16 ÐÐ Ð¸ Ð½Ðµ ÑÑÑÐ±Ð²Ð° Ð´Ð° Ð½Ð°Ð´ÑÐ²ÑÑÐ»Ñ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾ÑÐ¾ Ð¿ÑÐ¾ÑÑÑÐ°Ð½ÑÑÐ²Ð¾ Ð½Ð° Ð¸Ð·Ð±ÑÐ°Ð½Ð¾ÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾." IDS_WARNMAXIMUMRANGE "ÐÑÑÑÐ¾Ð²Ð¸ÑÑ ÑÐ°Ð·Ð¼ÐµÑ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ¸Ñ ÑÐ°Ð¹Ð» Ð½Ðµ ÑÑÑÐ±Ð²Ð° Ð´Ð° Ðµ Ð¿Ð¾-Ð¼Ð°Ð»ÑÐº Ð¾Ñ Ð½Ð°ÑÐ°Ð»Ð½Ð¸Ñ Ð¸ Ð½Ðµ ÑÑÑÐ±Ð²Ð° Ð´Ð° Ð½Ð°Ð´Ð²Ð¸ÑÐ°Ð²Ð° ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾ÑÐ¾ Ð¿ÑÐ¾ÑÑÑÐ°Ð½ÑÑÐ²Ð¾ Ð½Ð° Ð¸Ð·Ð±ÑÐ°Ð½Ð¾ÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾" - IDS_PAGEFILE_NONE "none" - IDS_PAGEFILE_SYSTEM "system managed" - IDS_INFOREBOOT "You have to reboot the computer, in order to apply the changes." + IDS_PAGEFILE_NONE "ÐÑÐ¼Ð°" + IDS_PAGEFILE_SYSTEM "System Managed" + IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -286,8 +286,8 @@ IDS_PETABYTE "PB RAM" IDS_VARIABLE "PromÄnnÃ¡" IDS_VALUE "Hodnota" - IDS_NO_DUMP "(nenÃ)" - IDS_MINI_DUMP "MinivÃ½pis(64KB)" + IDS_NO_DUMP "(NenÃ)" + IDS_MINI_DUMP "MinivÃ½pis (64KB)" IDS_KERNEL_DUMP "VÃ½pis kernelu" IDS_FULL_DUMP "KompletnÃ vÃ½pis" IDS_USERPROFILE_NAME "NÃ¡zev" @@ -300,8 +300,8 @@ IDS_WARNMAXIMUMSIZE "Zadejte ÄÃselnou hodnotu pro maximÃ¡lnÃ velikost strÃ¡nkovacÃho souboru." IDS_WARNINITIALRANGE "PoÄÃ¡teÄnÃ velikost strÃ¡nkovacÃho souboru nesmÃ bÃ½t menÅ¡Ã neÅ¾ 16 MB a nesmÃ pÅekroÄit mnoÅ¾stvÃ volnÃ©ho mÃsta na zvolenÃ© diskovÃ© jednotce." IDS_WARNMAXIMUMRANGE "MaximÃ¡lnÃ velikost strÃ¡nkovacÃho souboru nesmÃ bÃ½t menÅ¡Ã neÅ¾ velikost poÄÃ¡teÄnÃ, nesmÃ bÃ½t vÄtÅ¡Ã neÅ¾ 4095 MB a nesmÃ pÅekroÄit mnoÅ¾stvÃ volnÃ©ho mÃsta na zvolenÃ© diskovÃ© jednotce." - IDS_PAGEFILE_NONE "nenÃ" - IDS_PAGEFILE_SYSTEM "spravovÃ¡no systÃ©mem" + IDS_PAGEFILE_NONE "NenÃ" + IDS_PAGEFILE_SYSTEM "SpravovÃ¡no systÃ©mem" IDS_INFOREBOOT "ZmÄny se projevÃ po restartovÃ¡nÃ poÄÃtaÄe." IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -282,7 +282,7 @@ IDS_VARIABLE "Variable" IDS_VALUE "Value" IDS_NO_DUMP "(None)" - IDS_MINI_DUMP "Minidump(64KB)" + IDS_MINI_DUMP "Minidump (64KB)" IDS_KERNEL_DUMP "Kernel dump" IDS_FULL_DUMP "Complete dump" IDS_USERPROFILE_NAME "Name" @@ -295,9 +295,9 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." - IDS_PAGEFILE_NONE "none" - IDS_PAGEFILE_SYSTEM "system managed" - IDS_INFOREBOOT "You have to reboot the computer, in order to apply the changes." + IDS_PAGEFILE_NONE "None" + IDS_PAGEFILE_SYSTEM "System Managed" + IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -282,7 +282,7 @@ IDS_VARIABLE "ÎÎµÏÎ±Î²Î»Î·ÏÎ®" IDS_VALUE "Î¤Î¹Î¼Î®" IDS_NO_DUMP "(ÎÎ±Î½ÎÎ½Î±)" - IDS_MINI_DUMP "ÎÎ½Î´ÎµÎ¹Î¾Î· Î¼ÎµÎ¹ÏÎ¼ÎÎ½Î·Ï Î¼Î½Î®Î¼Î·Ï(64KB)" + IDS_MINI_DUMP "ÎÎ½Î´ÎµÎ¹Î¾Î· Î¼ÎµÎ¹ÏÎ¼ÎÎ½Î·Ï Î¼Î½Î®Î¼Î·Ï (64KB)" IDS_KERNEL_DUMP "ÎÎ½Î´ÎµÎ¹Î¾Î· Î¼Î½Î®Î¼Î·Ï ÏÏÏÎ®Î½Î±" IDS_FULL_DUMP "ÎÎ½Î´ÎµÎ¹Î¾Î· ÏÎ»Î®ÏÎ¿ÏÏ Î¼Î½Î®Î¼Î·Ï" IDS_USERPROFILE_NAME "ÎÎ½Î¿Î¼Î±" @@ -295,9 +295,9 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." - IDS_PAGEFILE_NONE "none" - IDS_PAGEFILE_SYSTEM "system managed" - IDS_INFOREBOOT "You have to reboot the computer, in order to apply the changes." + IDS_PAGEFILE_NONE "ÎÎ±Î½ÎÎ½Î±" + IDS_PAGEFILE_SYSTEM "System Managed" + IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -282,7 +282,7 @@ IDS_VARIABLE "Variable" IDS_VALUE "Value" IDS_NO_DUMP "(None)" - IDS_MINI_DUMP "Minidump(64KB)" + IDS_MINI_DUMP "Minidump (64KB)" IDS_KERNEL_DUMP "Kernel dump" IDS_FULL_DUMP "Complete dump" IDS_USERPROFILE_NAME "Name" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -297,8 +297,8 @@ IDS_WARNMAXIMUMSIZE "Introduzca el tamaÃ±o mÃ¡ximo del archivo de paginaciÃ³n." IDS_WARNINITIALRANGE "El tamaÃ±o inicial del archivo de paginaciÃ³n no puede ser inferior a 16 MB y no puede exceder el espacio disponible en la unidad seleccionada." IDS_WARNMAXIMUMRANGE "El tamaÃ±o mÃ¡ximo del archivo de paginaciÃ³n no puede ser inferior al tamaÃ±o inicial y no puede exceder el espacio disponible en la unidad seleccionada." - IDS_PAGEFILE_NONE "ninguno" - IDS_PAGEFILE_SYSTEM "administrado por el sistema" + IDS_PAGEFILE_NONE "Ninguno" + IDS_PAGEFILE_SYSTEM "Administrado por el sistema" IDS_INFOREBOOT "Es necesario reiniciar el equipo para que se apliquen los cambios." IDS_DEVS "\nEquipo de ReactOS\n\nCoordinador del proyecto\n\nAleksey Bragin\n\nEquipo de desarrollo\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nIngenieros de publicaciÃ³n de versiÃ³n\n\nColin Finck\nZ98\n\nEquipo Web\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nEquipo multimedia\n\nMindflyer\nWierd_W\n\nqueremos agradecer especialmente el trabajo realizado por\n\ntodos los colaboradores\nEl equipo de Wine\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirmar el borrado del perfil" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -53,7 +53,7 @@ LTEXT "RÃ©glages liÃ©s Ã votre compte utilsateur.", IDC_STATIC, 16, 88, 210, 20 PUSHBUTTON "RÃ©glages", IDC_USERPROFILE, 194, 103, 50, 15 GROUPBOX "DÃ©marrage et RÃ©cupÃ©ration", IDC_STATIC, 6, 131, 244, 52 - LTEXT "Les option DÃ©marrage et RÃ©cupÃ©ration indiquent Ã l'ordinateur comment dÃ©marrer et quoi faire si une erreur empÃªche l'ordinateur de s'arrÃªter.", IDC_STATIC, 16, 144, 210, 30 + LTEXT "Les options DÃ©marrage et RÃ©cupÃ©ration indiquent Ã l'ordinateur comment dÃ©marrer et quoi faire si une erreur empÃªche l'ordinateur de s'arrÃªter.", IDC_STATIC, 16, 144, 210, 30 PUSHBUTTON "RÃ©glages", IDC_STAREC, 194, 162, 50, 15 PUSHBUTTON "System Settings", IDC_SYSSETTINGS, 6, 192, 80, 15 PUSHBUTTON "Variables d'en&vironnement", IDC_ENVVAR, 88, 192, 80, 15 @@ -282,7 +282,7 @@ IDS_VARIABLE "Variable" IDS_VALUE "Valeur" IDS_NO_DUMP "(Aucun)" - IDS_MINI_DUMP "Mini clichÃ©(64Ko)" + IDS_MINI_DUMP "Mini clichÃ© (64Ko)" IDS_KERNEL_DUMP "ClichÃ© du noyau" IDS_FULL_DUMP "ClichÃ© complet" IDS_USERPROFILE_NAME "Nom" @@ -295,9 +295,9 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." - IDS_PAGEFILE_NONE "none" - IDS_PAGEFILE_SYSTEM "system managed" - IDS_INFOREBOOT "You have to reboot the computer, in order to apply the changes." + IDS_PAGEFILE_NONE "Aucun" + IDS_PAGEFILE_SYSTEM "System Managed" + IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/he-IL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/he-IL.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -284,7 +284,7 @@ IDS_VARIABLE "××©×ª× ×" IDS_VALUE "×¢×¨×" IDS_NO_DUMP "(×××)" - IDS_MINI_DUMP "Minidump(64KB)" + IDS_MINI_DUMP "Minidump (64KB)" IDS_KERNEL_DUMP "Kernel dump" IDS_FULL_DUMP "Complete dump" IDS_USERPROFILE_NAME "×©×" @@ -297,9 +297,9 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." - IDS_PAGEFILE_NONE "none" - IDS_PAGEFILE_SYSTEM "system managed" - IDS_INFOREBOOT "You have to reboot the computer, in order to apply the changes." + IDS_PAGEFILE_NONE "×××" + IDS_PAGEFILE_SYSTEM "System Managed" + IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -284,7 +284,7 @@ IDS_VARIABLE "Variable" IDS_VALUE "Value" IDS_NO_DUMP "(None)" - IDS_MINI_DUMP "Minidump(64KB)" + IDS_MINI_DUMP "Minidump (64KB)" IDS_KERNEL_DUMP "Kernel dump" IDS_FULL_DUMP "Complete dump" IDS_USERPROFILE_NAME "Name" @@ -297,9 +297,9 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." - IDS_PAGEFILE_NONE "none" - IDS_PAGEFILE_SYSTEM "system managed" - IDS_INFOREBOOT "You have to reboot the computer, in order to apply the changes." + IDS_PAGEFILE_NONE "None" + IDS_PAGEFILE_SYSTEM "System Managed" + IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -282,7 +282,7 @@ IDS_VARIABLE "Variabel" IDS_VALUE "Nilai" IDS_NO_DUMP "(None)" - IDS_MINI_DUMP "Minidump(64KB)" + IDS_MINI_DUMP "Minidump (64KB)" IDS_KERNEL_DUMP "Kernel dump" IDS_FULL_DUMP "Complete dump" IDS_USERPROFILE_NAME "Name" @@ -295,9 +295,9 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." - IDS_PAGEFILE_NONE "none" - IDS_PAGEFILE_SYSTEM "system managed" - IDS_INFOREBOOT "You have to reboot the computer, in order to apply the changes." + IDS_PAGEFILE_NONE "None" + IDS_PAGEFILE_SYSTEM "System Managed" + IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -282,9 +282,9 @@ IDS_VARIABLE "Variabile" IDS_VALUE "Valore" IDS_NO_DUMP "(None)" - IDS_MINI_DUMP "Minidump(64KB)" + IDS_MINI_DUMP "Minidump (64KB)" IDS_KERNEL_DUMP "Kernel dump" - IDS_FULL_DUMP "dump completo" + IDS_FULL_DUMP "Dump completo" IDS_USERPROFILE_NAME "Nome" IDS_USERPROFILE_SIZE "Dimensione" IDS_USERPROFILE_TYPE "Tipo" @@ -295,9 +295,9 @@ IDS_WARNMAXIMUMSIZE "Immettere la dimensione massima del file di paging." IDS_WARNINITIALRANGE "La dimensione iniziale del file di paging non puÃ² essere inferiore a 16 MB e non puÃ² superare lo spazio disponibile nell'unitÃ selezionata." IDS_WARNMAXIMUMRANGE "La dimensione massima del file di paging non puÃ² essere inferiore a quella iniziale e non puÃ² superare lo spazio disponibile nell'unitÃ selezionata." - IDS_PAGEFILE_NONE "none" - IDS_PAGEFILE_SYSTEM "system managed" - IDS_INFOREBOOT "You have to reboot the computer, in order to apply the changes." + IDS_PAGEFILE_NONE "None" + IDS_PAGEFILE_SYSTEM "System Managed" + IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." IDS_DEVS "\nReactOS Team\n\nCoordinatore\n\nAleksey Bragin\n\nGruppo di sviluppo\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nUlteriori ringraziamenti\n\na tutti i Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -282,7 +282,7 @@ IDS_VARIABLE "å¯å¤" IDS_VALUE "å¤" IDS_NO_DUMP "(ãªã)" - IDS_MINI_DUMP "ãããã³ã(64KB)" + IDS_MINI_DUMP "ãããã³ã (64KB)" IDS_KERNEL_DUMP "ã«ã¼ãã« ãã³ã" IDS_FULL_DUMP "å®å¨ ãã³ã" IDS_USERPROFILE_NAME "åå" @@ -295,9 +295,9 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." - IDS_PAGEFILE_NONE "none" - IDS_PAGEFILE_SYSTEM "system managed" - IDS_INFOREBOOT "You have to reboot the computer, in order to apply the changes." + IDS_PAGEFILE_NONE "ãªã" + IDS_PAGEFILE_SYSTEM "System Managed" + IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -282,7 +282,7 @@ IDS_VARIABLE "Variable" IDS_VALUE "Value" IDS_NO_DUMP "(None)" - IDS_MINI_DUMP "Minidump(64KB)" + IDS_MINI_DUMP "Minidump (64KB)" IDS_KERNEL_DUMP "Kernel dump" IDS_FULL_DUMP "Complete dump" IDS_USERPROFILE_NAME "Name" @@ -295,9 +295,9 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." - IDS_PAGEFILE_NONE "none" - IDS_PAGEFILE_SYSTEM "system managed" - IDS_INFOREBOOT "You have to reboot the computer, in order to apply the changes." + IDS_PAGEFILE_NONE "None" + IDS_PAGEFILE_SYSTEM "System Managed" + IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -282,7 +282,7 @@ IDS_VARIABLE "Variabel" IDS_VALUE "Verdi" IDS_NO_DUMP "(Ingen)" - IDS_MINI_DUMP "Minidump(64KB)" + IDS_MINI_DUMP "Minidump (64KB)" IDS_KERNEL_DUMP "Kernel dump" IDS_FULL_DUMP "Fullstendig dump" IDS_USERPROFILE_NAME "Navn" @@ -295,9 +295,9 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." - IDS_PAGEFILE_NONE "none" - IDS_PAGEFILE_SYSTEM "system managed" - IDS_INFOREBOOT "You have to reboot the computer, in order to apply the changes." + IDS_PAGEFILE_NONE "Ingen" + IDS_PAGEFILE_SYSTEM "System Managed" + IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -291,7 +291,7 @@ IDS_VARIABLE "Zmienna" IDS_VALUE "WartoÅÄ" IDS_NO_DUMP "(Brak)" - IDS_MINI_DUMP "Minimalny zrzut pamiÄci(64KB)" + IDS_MINI_DUMP "Minimalny zrzut pamiÄci (64KB)" IDS_KERNEL_DUMP "Zrzut pamiÄci kernela" IDS_FULL_DUMP "Zrzut caÅej pamiÄci" IDS_USERPROFILE_NAME "Nazwa" @@ -304,7 +304,7 @@ IDS_WARNMAXIMUMSIZE "WprowadÅº wielkoÅÄ dla maksymalnego rozmiaru pliku stronicowania." IDS_WARNINITIALRANGE "PoczÄtkowy rozmiar pliku stronicowania nie moÅ¼e byÄ mniejszy niÅ¼ 16MB i nie moÅ¼e przekraczaÄ dostÄpnej iloÅci miejsca w wybranym napÄdzie." IDS_WARNMAXIMUMRANGE "Maksymalny rozmiar pliku stronicowania nie moÅ¼e byÄ mniejszy niÅ¼ jego rozmiar poczÄtkowy i nie moÅ¼e przekraczaÄ dostÄpnej iloÅci miejsca w wybranym napÄdzie." - IDS_PAGEFILE_NONE "brak" + IDS_PAGEFILE_NONE "Brak" IDS_PAGEFILE_SYSTEM "Kontrolowany przez system" IDS_INFOREBOOT "Musisz ponownie uruchomiÄ komputer, aby zastosowaÄ zmiany." IDS_DEVS "\nEkipa ReactOS\n\nKoordynator Projektu\n\nAleksey Bragin\n\nEkipa ProgramistÃ³w\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nInÅ¼ynierowie WydaÅ\n\nColin Finck\nZ98\n\nEkipa WWW\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nEkipa PR\n\nMindflyer\nWierd_W\n\nPodziÄkowania dla\n\nwszystkich wspÃ³ÅpracownikÃ³w\nEkipy Wine\n\n"//FIXME Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -290,10 +290,10 @@ IDS_PETABYTE "Po de memorie" IDS_VARIABLE "VariabilÄ" IDS_VALUE "Valoare" - IDS_NO_DUMP "(fÄrÄ fiÈier de depanare)" - IDS_MINI_DUMP "depanare elementarÄ (64ko)" - IDS_KERNEL_DUMP "depanare nucleu" - IDS_FULL_DUMP "depanare completÄ" + IDS_NO_DUMP "(FÄrÄ fiÈier de depanare)" + IDS_MINI_DUMP "Depanare elementarÄ (64ko)" + IDS_KERNEL_DUMP "Depanare nucleu" + IDS_FULL_DUMP "Depanare completÄ" IDS_USERPROFILE_NAME "Nume" IDS_USERPROFILE_SIZE "MÄrime" IDS_USERPROFILE_TYPE "Tip" @@ -304,8 +304,8 @@ IDS_WARNMAXIMUMSIZE "IntroduceÈi o valoare numericÄ pentru dimensiunea maximÄ a fiÈierului de paginare." IDS_WARNINITIALRANGE "Dimensiunea iniÈialÄ a fiÈierului de paginare trebuie sÄ fie Ã®ncadratÄ Ã®ntre 16 Mo Èi spaÈiul liber disponibil al unitÄÈii selectate." IDS_WARNMAXIMUMRANGE "Dimensiunea maximÄ a fiÈierului de paginare trebuie sÄ fie Ã®ncadratÄ Ã®ntre dimensiunea iniÈialÄ Èi spaÈiul liber disponibil al unitÄÈii selectate." - IDS_PAGEFILE_NONE "nespecificat" - IDS_PAGEFILE_SYSTEM "gestionat de sistem" + IDS_PAGEFILE_NONE "Nespecificat" + IDS_PAGEFILE_SYSTEM "Gestionat de sistem" IDS_INFOREBOOT "Pentru aplicarea modificÄrilor este necesarÄ repornirea calculatorului." IDS_DEVS "\nEchipa ReactOS\n\nCoordonator de proiect\n\nAleksey Bragin\n\nEchipa de dezvoltare\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nIngineri de distribuÈie\n\nColin Finck\nZ98\n\nEchipa paginii web\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nEchipa multimedia\n\nMindflyer\nWierd_W\n\nmulÈumiri adresate cÄtre\n\ntoÈi Contribuitorii\nEchipa Wine\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "ConfirmaÈi eliminarea profilului" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -281,7 +281,7 @@ IDS_PETABYTE "ÐÐ± ÐÐÐ£" IDS_VARIABLE "ÐÐµÑÐµÐ¼ÐµÐ½Ð½Ð°Ñ" IDS_VALUE "ÐÐ½Ð°ÑÐµÐ½Ð¸Ðµ" - IDS_NO_DUMP "(Ð½ÐµÑ)" + IDS_NO_DUMP "(ÐÐµÑ)" IDS_MINI_DUMP "ÐÐ°Ð»ÑÐ¹ Ð´Ð°Ð¼Ð¿ (64ÐÐ±)" IDS_KERNEL_DUMP "ÐÐ°Ð¼Ð¿ ÑÐ´ÑÐ°" IDS_FULL_DUMP "ÐÐ¾Ð»Ð½ÑÐ¹ Ð´Ð°Ð¼Ð¿" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -289,7 +289,7 @@ IDS_PETABYTE "PB pamÃ¤te RAM" IDS_VARIABLE "PremennÃ¡" IDS_VALUE "Hodnota" - IDS_NO_DUMP "(Å¾iadne)" + IDS_NO_DUMP "(Å½iadne)" IDS_MINI_DUMP "MalÃ½ vÃ½pis pamÃ¤te (64 kB)" IDS_KERNEL_DUMP "VÃ½pis pamÃ¤te jadra" IDS_FULL_DUMP "ÃplnÃ½ vÃ½pis pamÃ¤te" @@ -303,9 +303,9 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." - IDS_PAGEFILE_NONE "none" - IDS_PAGEFILE_SYSTEM "system managed" - IDS_INFOREBOOT "You have to reboot the computer, in order to apply the changes." + IDS_PAGEFILE_NONE "Å½iadne" + IDS_PAGEFILE_SYSTEM "System Managed" + IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/sq-AL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/sq-AL.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -282,7 +282,7 @@ IDS_VARIABLE "VariablÃ«" IDS_VALUE "Vlera" IDS_NO_DUMP "(AsnjÃ«)" - IDS_MINI_DUMP "Minidump(64KB)" + IDS_MINI_DUMP "Minidump (64KB)" IDS_KERNEL_DUMP "Hedh BÃ«rthamÃ«n" IDS_FULL_DUMP "Hedh Komplet" IDS_USERPROFILE_NAME "Emri" @@ -295,9 +295,9 @@ IDS_WARNMAXIMUMSIZE "Futni njÃ« vlerÃ« numerike pÃ«r madhÃ«sinÃ« maksimale e faqeve tÃ« dokumentave." IDS_WARNINITIALRANGE "MadhÃ«sia fillestare e faqes sÃ« dokumentit nuk duhet tÃ« jetÃ« mÃ« e vogÃ«l se 16 MB dhe nuk duhet tÃ« kalojÃ« hapÃ«sirÃ«n nÃ« dispozicion nÃ« driver-in e pÃ«rzgjedhur." IDS_WARNMAXIMUMRANGE "MadhÃ«sia maksimale e faqes sÃ« dokumenit nuk duhet tÃ« jetÃ« mÃ« e vogÃ«l se madhÃ«sia e saj fillestare dhe nuk duhet tÃ« kalojÃ« hapÃ«sirÃ«n nÃ« dispozicion nÃ« driver-in e pÃ«rzgjedhur." - IDS_PAGEFILE_NONE "none" - IDS_PAGEFILE_SYSTEM "system managed" - IDS_INFOREBOOT "You have to reboot the computer, in order to apply the changes." + IDS_PAGEFILE_NONE "AsnjÃ«" + IDS_PAGEFILE_SYSTEM "System Managed" + IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -284,7 +284,7 @@ IDS_VARIABLE "Variabel" IDS_VALUE "VÃ¤rde" IDS_NO_DUMP "(None)" - IDS_MINI_DUMP "Minidump(64KB)" + IDS_MINI_DUMP "Minidump (64KB)" IDS_KERNEL_DUMP "Kerneldump" IDS_FULL_DUMP "Komplett dump" IDS_USERPROFILE_NAME "Namn" @@ -297,9 +297,9 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." - IDS_PAGEFILE_NONE "none" - IDS_PAGEFILE_SYSTEM "system managed" - IDS_INFOREBOOT "You have to reboot the computer, in order to apply the changes." + IDS_PAGEFILE_NONE "None" + IDS_PAGEFILE_SYSTEM "System Managed" + IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -289,8 +289,8 @@ IDS_PETABYTE "ÐÐ± ÐÐÐ" IDS_VARIABLE "ÐÐ¼ÑÐ½Ð½Ð°" IDS_VALUE "ÐÐ½Ð°ÑÐµÐ½Ð½Ñ" - IDS_NO_DUMP "(Ð½ÐµÐ¼Ð°Ñ)" - IDS_MINI_DUMP "ÐÑÐ½ÑÐ´Ð°Ð¼Ð¿(64ÐÐ±)" + IDS_NO_DUMP "(ÐÐµÐ¼Ð°Ñ)" + IDS_MINI_DUMP "ÐÑÐ½ÑÐ´Ð°Ð¼Ð¿ (64ÐÐ±)" IDS_KERNEL_DUMP "ÐÐ°Ð¼Ð¿ ÑÐ´ÑÐ°" IDS_FULL_DUMP "ÐÐ¾Ð²Ð½Ð¸Ð¹ Ð´Ð°Ð¼Ð¿" IDS_USERPROFILE_NAME "ÐÐ¼'Ñ" @@ -303,9 +303,9 @@ IDS_WARNMAXIMUMSIZE "ÐÐ²ÐµÐ´ÑÑÑ ÑÐ¸ÑÐ»Ð¾Ð²Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð¾Ð³Ð¾ ÑÐ¾Ð·Ð¼ÑÑÑ ÑÐ°Ð¹Ð»Ñ Ð´Ð¾Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ." IDS_WARNINITIALRANGE "ÐÐ¾ÑÐ°ÑÐºÐ¾Ð²Ð¸Ð¹ ÑÐ¾Ð·Ð¼ÑÑ ÑÐ°Ð¹Ð»Ñ Ð´Ð¾Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ Ð±ÑÑÐ¸ Ð¼ÐµÐ½ÑÐ¸Ð¼ 16 ÐÐ± Ñ Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ Ð¿ÐµÑÐµÐ²Ð¸ÑÑÐ²Ð°ÑÐ¸ Ð¾Ð±'ÑÐ¼ Ð²ÑÐ»ÑÐ½Ð¾Ð³Ð¾ Ð¼ÑÑÑÑ Ð½Ð° Ð¾Ð±ÑÐ°Ð½Ð¾Ð¼Ñ Ð´Ð¸ÑÐºÑ." IDS_WARNMAXIMUMRANGE "ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð¸Ð¹ ÑÐ¾Ð·Ð¼ÑÑ ÑÐ°Ð¹Ð»Ñ Ð´Ð¾Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ Ð±ÑÑÐ¸ Ð¼ÐµÐ½ÑÐ¸Ð¼ Ð²ÑÐ´ Ð¿Ð¾ÑÐ°ÑÐºÐ¾Ð²Ð¾Ð³Ð¾ ÑÐ° Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ Ð¿ÐµÑÐµÐ²Ð¸ÑÑÐ²Ð°ÑÐ¸ Ð¾Ð±'ÑÐ¼ Ð²ÑÐ»ÑÐ½Ð¾Ð³Ð¾ Ð¼ÑÑÑÑ Ð½Ð° Ð¾Ð±ÑÐ°Ð½Ð¾Ð¼Ñ Ð´Ð¸ÑÐºÑ." - IDS_PAGEFILE_NONE "none" - IDS_PAGEFILE_SYSTEM "system managed" - IDS_INFOREBOOT "You have to reboot the computer, in order to apply the changes." + IDS_PAGEFILE_NONE "ÐÐµÐ¼Ð°Ñ" + IDS_PAGEFILE_SYSTEM "System Managed" + IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -284,7 +284,7 @@ IDS_VARIABLE "åé" IDS_VALUE "å¼" IDS_NO_DUMP "(æ )" - IDS_MINI_DUMP "å°ååè½¬å¨(64KB)" + IDS_MINI_DUMP "å°ååè½¬å¨ (64KB)" IDS_KERNEL_DUMP "æ ¸å¿ååè½¬å¨" IDS_FULL_DUMP "å®å¨ååè½¬å¨" IDS_USERPROFILE_NAME "åç§°" @@ -297,7 +297,7 @@ IDS_WARNMAXIMUMSIZE "ä¸ºåé¡µæä»¶çæå¤§å¤§å°è¾å¥ä¸ä¸ªæ°åå¼ã" IDS_WARNINITIALRANGE "åé¡µæä»¶çåå§å¤§å°ä¸å¾å°äº 16 MBï¼å¹¶ä¸ä¸å¾è¶è¿æéç£çä¸çå¯ç¨ç©ºé´ã" IDS_WARNMAXIMUMRANGE "åé¡µæä»¶çæå¤§å¤§å°ä¸è½å°äºå¶åå§å¤§å°åä¸è½è¶è¿æéç£çä¸çå¯ç¨ç©ºé´ã" - IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_NONE "æ " IDS_PAGEFILE_SYSTEM "ç³»ç»å·²ç®¡ç" IDS_INFOREBOOT "æ¨å¿é¡»éæ°å¯å¨è®¡ç®æºï¼æè½åºç¨æ´æ¹ã" IDS_DEVS "\nReactOS å¢é\n\né¡¹ç®åè°å\n\nAleksey Bragin\n\nå¼åå¢é\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nç½ç«å¢é\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nåªä½å¢é\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/zh-TW.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/zh-TW.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -284,7 +284,7 @@ IDS_VARIABLE "è®é" IDS_VALUE "å¼" IDS_NO_DUMP "(ç¡)" - IDS_MINI_DUMP "å°å§åè½å²(64KB)" + IDS_MINI_DUMP "å°å§åè½å² (64KB)" IDS_KERNEL_DUMP "æ ¸å¿å§åè½å²" IDS_FULL_DUMP "å®å¨å§åè½å²" IDS_USERPROFILE_NAME "åç¨±" @@ -297,7 +297,7 @@ IDS_WARNMAXIMUMSIZE "ç²åé æä»¶çæå¤§å¤§å°è¼¸å¥ä¸åæ¸åå¼ã" IDS_WARNINITIALRANGE "åé æä»¶çåå§å¤§å°ä¸å¾å°æ¼ 16 MBï¼ä¸¦ä¸ä¸å¾è¶éæé¸ç£ç¤ä¸çå¯ç¨ç©ºéã" IDS_WARNMAXIMUMRANGE "åé æä»¶çæå¤§å¤§å°ä¸è½å°æ¼å¶åå§å¤§å°åä¸è½è¶éæé¸ç£ç¤ä¸çå¯ç¨ç©ºéã" - IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_NONE "ç¡" IDS_PAGEFILE_SYSTEM "ç³»çµ±å·²ç®¡ç" IDS_INFOREBOOT "æ¨å¿é éæ°ååè¨ç®æ©ï¼æè½æç¨æ´æ¹ã" IDS_DEVS "\nReactOS åé\n\né ç®åèª¿å¡\n\nAleksey Bragin\n\néç¼åé\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nç¶²ç«åé\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nåªé«åé\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" Modified: branches/ros-branch-0_4_0/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -68,6 +68,9 @@ #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" #endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif Modified: branches/ros-branch-0_4_0/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Thu Dec 17 11:14:34 2015 @@ -1562,6 +1562,7 @@ VARIANT parmIn; OLECMD commandInfo; HRESULT hResult; + wchar_t templateString[200]; notifyInfo = (NMTOOLBARW *)pNMHDR; if (notifyInfo->hdr.hwndFrom != fToolbarWindow) @@ -1584,10 +1585,15 @@ if ((commandInfo.cmdf & (OLECMDF_ENABLED | OLECMDF_LATCHED)) == OLECMDF_ENABLED && travelLog->CountEntries(browserService) > 1) { - AppendMenu(newMenu, MF_SEPARATOR, -1, L""); - AppendMenu(newMenu, MF_STRING /* | MF_OWNERDRAW */, IDM_EXPLORERBAR_HISTORY, L"&History\tCtrl+H"); + AppendMenuW(newMenu, MF_SEPARATOR, -1, L""); + + if (LoadStringW(_AtlBaseModule.GetResourceInstance(), + IDS_HISTORYTEXT, templateString, sizeof(templateString) / sizeof(wchar_t)) == 0) + StringCbCopyW(templateString, sizeof(templateString), L"&History\tCtrl+H"); + + AppendMenuW(newMenu, MF_STRING /* | MF_OWNERDRAW */, IDM_EXPLORERBAR_HISTORY, templateString); } - params.cbSize = sizeof (params); + params.cbSize = sizeof(params); params.rcExclude = bounds; selectedItem = TrackPopupMenuEx(newMenu, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD, bounds.left, bounds.bottom, m_hWnd, &params); @@ -1611,10 +1617,15 @@ if ((commandInfo.cmdf & (OLECMDF_ENABLED | OLECMDF_LATCHED)) == OLECMDF_ENABLED && travelLog->CountEntries(browserService) > 1) { - AppendMenu(newMenu, MF_SEPARATOR, -1, L""); - AppendMenu(newMenu, MF_STRING /* | MF_OWNERDRAW */, IDM_EXPLORERBAR_HISTORY, L"&History\tCtrl+H"); + AppendMenuW(newMenu, MF_SEPARATOR, -1, L""); + + if (LoadStringW(_AtlBaseModule.GetResourceInstance(), + IDS_HISTORYTEXT, templateString, sizeof(templateString) / sizeof(wchar_t)) == 0) + StringCbCopyW(templateString, sizeof(templateString), L"&History\tCtrl+H"); + + AppendMenuW(newMenu, MF_STRING /* | MF_OWNERDRAW */, IDM_EXPLORERBAR_HISTORY, templateString); } - params.cbSize = sizeof (params); + params.cbSize = sizeof(params); params.rcExclude = bounds; selectedItem = TrackPopupMenuEx(newMenu, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD, bounds.left, bounds.bottom, m_hWnd, &params); @@ -1769,8 +1780,8 @@ CComPtr<ITravelLog> travelLog; TOOLTIPTEXTW *pTTTW; UINT nID; + HRESULT hResult; wchar_t tempString[300]; - HRESULT hResult; pTTTW = reinterpret_cast<TOOLTIPTEXTW *>(pNMHDR); if ((pTTTW->uFlags & TTF_IDISHWND) != 0) @@ -1796,7 +1807,7 @@ } else tempString[0] = 0; - wcsncpy (pTTTW->szText, tempString, sizeof (pTTTW->szText) / sizeof (wchar_t)); + wcsncpy (pTTTW->szText, tempString, sizeof(pTTTW->szText) / sizeof(wchar_t)); ::SetWindowPos(pNMHDR->hwndFrom, HWND_TOP, 0, 0, 0, 0, SWP_NOOWNERZORDER | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); return 0;

1 0

[akhaldi] 70381: [TRANSLATIONS] Traditional Chinese translation update by Henry Tang Ih. CORE-10655
by akhaldi＠svn.reactos.org 17 Dec '15

17 Dec '15

Author: akhaldi Date: Thu Dec 17 11:10:00 2015 New Revision: 70381 URL: http://svn.reactos.org/svn/reactos?rev=70381&view=rev Log: [TRANSLATIONS] Traditional Chinese translation update by Henry Tang Ih. CORE-10655 Added: trunk/reactos/boot/freeldr/fdebug/lang/zh-TW.rc (with props) trunk/reactos/dll/shellext/deskadp/lang/zh-TW.rc (with props) trunk/reactos/dll/shellext/deskmon/lang/zh-TW.rc (with props) trunk/reactos/dll/shellext/ntobjshex/lang/zh-TW.rc (with props) trunk/reactos/dll/shellext/slayer/lang/zh-TW.rc (with props) trunk/reactos/dll/shellext/stobject/lang/zh-TW.rc (with props) trunk/reactos/dll/win32/aclui/lang/zh-TW.rc (with props) trunk/reactos/dll/win32/browseui/lang/zh-TW.rc (with props) trunk/reactos/dll/win32/devmgr/lang/zh-TW.rc (with props) trunk/reactos/dll/win32/ieframe/lang/zh-TW.rc (with props) trunk/reactos/dll/win32/lsasrv/lang/zh-TW.rc (with props) trunk/reactos/dll/win32/msgina/lang/zh-TW.rc (with props) trunk/reactos/dll/win32/msports/lang/zh-TW.rc (with props) trunk/reactos/dll/win32/mycomput/lang/zh-TW.rc (with props) trunk/reactos/dll/win32/netcfgx/lang/zh-TW.rc (with props) trunk/reactos/dll/win32/netid/lang/zh-TW.rc (with props) trunk/reactos/dll/win32/newdev/lang/zh-TW.rc (with props) trunk/reactos/dll/win32/samsrv/lang/zh-TW.rc (with props) trunk/reactos/dll/win32/serialui/lang/zh-TW.rc (with props) trunk/reactos/dll/win32/setupapi/lang/zh-TW.rc (with props) trunk/reactos/dll/win32/shimgvw/lang/zh-TW.rc (with props) trunk/reactos/dll/win32/syssetup/lang/zh-TW.rc (with props) trunk/reactos/dll/win32/tapiui/lang/zh-TW.rc (with props) Modified: trunk/reactos/base/shell/explorer/lang/zh-TW.rc trunk/reactos/boot/freeldr/fdebug/fdebug.rc trunk/reactos/dll/shellext/deskadp/deskadp.rc trunk/reactos/dll/shellext/deskmon/deskmon.rc trunk/reactos/dll/shellext/netshell/lang/zh-TW.rc trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc trunk/reactos/dll/shellext/slayer/slayer.rc trunk/reactos/dll/shellext/stobject/stobject.rc trunk/reactos/dll/win32/aclui/aclui.rc trunk/reactos/dll/win32/browseui/browseui.rc trunk/reactos/dll/win32/devmgr/devmgr.rc trunk/reactos/dll/win32/ieframe/ieframe.rc trunk/reactos/dll/win32/lsasrv/lsasrv.rc trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/msports/msports.rc trunk/reactos/dll/win32/mycomput/mycomput.rc trunk/reactos/dll/win32/netcfgx/netcfgx.rc trunk/reactos/dll/win32/netid/netid.rc trunk/reactos/dll/win32/newdev/newdev.rc trunk/reactos/dll/win32/samsrv/samsrv.rc trunk/reactos/dll/win32/serialui/serialui.rc trunk/reactos/dll/win32/setupapi/setupapi.rc trunk/reactos/dll/win32/shimgvw/shimgvw.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/tapiui/tapiui.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/shell/explorer/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/z… Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… Added: trunk/reactos/boot/freeldr/fdebug/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/z… Modified: trunk/reactos/dll/shellext/deskadp/deskadp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/deska… Added: trunk/reactos/dll/shellext/deskadp/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/shellext/deskmon/deskmon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/deskm… Added: trunk/reactos/dll/shellext/deskmon/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… Modified: trunk/reactos/dll/shellext/netshell/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Added: trunk/reactos/dll/shellext/ntobjshex/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/lan… Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… Added: trunk/reactos/dll/shellext/slayer/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/lang/z… Modified: trunk/reactos/dll/shellext/slayer/slayer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/slayer… Added: trunk/reactos/dll/shellext/stobject/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… Modified: trunk/reactos/dll/shellext/stobject/stobject.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/stob… Modified: trunk/reactos/dll/win32/aclui/aclui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.rc?r… Added: trunk/reactos/dll/win32/aclui/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/zh-TW… Modified: trunk/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… Added: trunk/reactos/dll/win32/browseui/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/zh… Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rc… Added: trunk/reactos/dll/win32/devmgr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/zh-T… Modified: trunk/reactos/dll/win32/ieframe/ieframe.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… Added: trunk/reactos/dll/win32/ieframe/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/lang/zh-… Added: trunk/reactos/dll/win32/lsasrv/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lang/zh-T… Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.rc… Added: trunk/reactos/dll/win32/msgina/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/zh-T… Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… Added: trunk/reactos/dll/win32/msports/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/zh-… Modified: trunk/reactos/dll/win32/msports/msports.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… Added: trunk/reactos/dll/win32/mycomput/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mycomput/lang/zh… Modified: trunk/reactos/dll/win32/mycomput/mycomput.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mycomput/mycompu… Added: trunk/reactos/dll/win32/netcfgx/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/zh-… Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… Added: trunk/reactos/dll/win32/netid/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/zh-TW… Modified: trunk/reactos/dll/win32/netid/netid.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.rc?r… Added: trunk/reactos/dll/win32/newdev/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/zh-T… Modified: trunk/reactos/dll/win32/newdev/newdev.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.rc… Added: trunk/reactos/dll/win32/samsrv/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/lang/zh-T… Modified: trunk/reactos/dll/win32/samsrv/samsrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.rc… Added: trunk/reactos/dll/win32/serialui/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/zh… Modified: trunk/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/serialu… Added: trunk/reactos/dll/win32/setupapi/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/zh… Modified: trunk/reactos/dll/win32/setupapi/setupapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… Added: trunk/reactos/dll/win32/shimgvw/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/zh-… Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… Added: trunk/reactos/dll/win32/syssetup/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… Added: trunk/reactos/dll/win32/tapiui/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/zh-T… Modified: trunk/reactos/dll/win32/tapiui/tapiui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/tapiui.rc…

1 0

[akhaldi] 70380: [0.4.0] * Merge the translation fixes by Hermès in r70373.
by akhaldi＠svn.reactos.org 17 Dec '15

17 Dec '15

Author: akhaldi Date: Thu Dec 17 10:10:33 2015 New Revision: 70380 URL: http://svn.reactos.org/svn/reactos?rev=70380&view=rev Log: [0.4.0] * Merge the translation fixes by Hermès in r70373. Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/base/applications/regedit/lang/he-IL.rc branches/ros-branch-0_4_0/reactos/media/inf/shortcuts.inf Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 17 10:10:33 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369 +/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 17 10:10:33 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373 Modified: branches/ros-branch-0_4_0/reactos/base/applications/regedit/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/regedit/lang/he-IL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/regedit/lang/he-IL.rc [iso-8859-1] Thu Dec 17 10:10:33 2015 @@ -261,7 +261,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "×¢××¨× ××¨×©××" + IDS_APP_TITLE "×¢××¨× ××¨××©××" IDC_REGEDIT "REGEDIT" IDC_REGEDIT_FRAME "REGEDIT_FRAME" END Modified: branches/ros-branch-0_4_0/reactos/media/inf/shortcuts.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/media/… ============================================================================== --- branches/ros-branch-0_4_0/reactos/media/inf/shortcuts.inf [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/media/inf/shortcuts.inf [iso-8859-1] Thu Dec 17 10:10:33 2015 @@ -466,7 +466,7 @@ CHARMAP_DESC=KirjamÃ¤rkide Tabel KBSWITCH_TITLE=Keyboard Layout Switcher KBSWITCH_DESC=Klaviatuuriasetuse Muutmine -REGEDIT_TITLE=Regedit +REGEDIT_TITLE=Registriredaktor REGEDIT_DESC=Ava Registriredaktor DXDIAG_TITLE=ReactX Diagnostic DXDIAG_DESC=Ava ReactX-Diagnostika programm @@ -527,7 +527,7 @@ CHARMAP_DESC=Table des CaractÃ¨res KBSWITCH_TITLE=SÃ©lecteur de configuration clavier KBSWITCH_DESC=SÃ©lecteur de configuration clavier -REGEDIT_TITLE=Regedit +REGEDIT_TITLE=Ãditeur de Registre REGEDIT_DESC=Lancer l'Ãditeur de Registre DXDIAG_TITLE=Diagnostic ReactX DXDIAG_DESC=Lancer le prorgramme de diagnostic ReactX @@ -588,7 +588,7 @@ CHARMAP_DESC=××¤×ª ××ª×××× KBSWITCH_TITLE=Keyboard Layout Switcher KBSWITCH_DESC=Keyboard Layout Switcher -REGEDIT_TITLE=Regedit +REGEDIT_TITLE=×¢××¨× ××¨××©×× REGEDIT_DESC=×¢××¨× ××¨××©×× DXDIAG_TITLE=ReactX Diagnostic DXDIAG_DESC=Launch ReactX-Diagnostic program @@ -649,7 +649,7 @@ CHARMAP_DESC=CharMap KBSWITCH_TITLE=Keyboard Layout Switcher KBSWITCH_DESC=Keyboard Layout Switcher -REGEDIT_TITLE=Regedit +REGEDIT_TITLE=Registry Editor REGEDIT_DESC=Launch Registry Editor DXDIAG_TITLE=ReactX Diagnostic DXDIAG_DESC=Launch ReactX-Diagnostic program @@ -710,7 +710,7 @@ CHARMAP_DESC=CharMap KBSWITCH_TITLE=Keyboard Layout Switcher KBSWITCH_DESC=Keyboard Layout Switcher -REGEDIT_TITLE=Regedit +REGEDIT_TITLE=Editor Registri REGEDIT_DESC=Jalankan Editor Registri DXDIAG_TITLE=ReactX Diagnostic DXDIAG_DESC=Launch ReactX-Diagnostic program @@ -771,7 +771,7 @@ CHARMAP_DESC=Mappa dei caratteri KBSWITCH_TITLE=Layout di tastiera KBSWITCH_DESC=Cambia il layout di tastiera -REGEDIT_TITLE=Regedit +REGEDIT_TITLE=Editor del registro REGEDIT_DESC=Lancia l'editor del registro DXDIAG_TITLE=ReactX Diagnostica DXDIAG_DESC=Esegui il programma di diagnostica ReactX- @@ -893,7 +893,7 @@ CHARMAP_DESC=CharMap KBSWITCH_TITLE=Keyboard Layout Switcher KBSWITCH_DESC=Keyboard Layout Switcher -REGEDIT_TITLE=Regedit +REGEDIT_TITLE=Registry Editor REGEDIT_DESC=Launch Registry Editor DXDIAG_TITLE=ReactX Diagnostic DXDIAG_DESC=Launch ReactX-Diagnostic program @@ -954,7 +954,7 @@ CHARMAP_DESC=Tegnkart KBSWITCH_TITLE=Keyboard Layout Switcher KBSWITCH_DESC=Endre tastaturvalg -REGEDIT_TITLE=Regedit +REGEDIT_TITLE=Registerredigering REGEDIT_DESC=Start Registerredigering DXDIAG_TITLE=ReactX Diagnostic DXDIAG_DESC=KjÃ¸r ReactX-Diagnose program @@ -1076,7 +1076,7 @@ CHARMAP_DESC=Mapa de Caracteres KBSWITCH_TITLE=Keyboard Layout Switcher KBSWITCH_DESC=Alterador de Layout de Teclado -REGEDIT_TITLE=Regedit +REGEDIT_TITLE=Editor do Registro REGEDIT_DESC=Iniciar Editor do Registro DXDIAG_TITLE=ReactX Diagnostic DXDIAG_DESC=Iniciar o ReactX-Diagnostic

1 0

[ekohl] 70379: [NETCFGX] Implement INetCfgPnpReconfigCallback stub.
by ekohl＠svn.reactos.org 17 Dec '15

17 Dec '15

Author: ekohl Date: Thu Dec 17 09:32:10 2015 New Revision: 70379 URL: http://svn.reactos.org/svn/reactos?rev=70379&view=rev Log: [NETCFGX] Implement INetCfgPnpReconfigCallback stub. Modified: trunk/reactos/dll/win32/netcfgx/netcfg_iface.c Modified: trunk/reactos/dll/win32/netcfgx/netcfg_iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfg_i… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] Thu Dec 17 09:32:10 2015 @@ -4,6 +4,7 @@ { const INetCfg * lpVtbl; const INetCfgLock * lpVtblLock; + const INetCfgPnpReconfigCallback *lpVtblPnpReconfigCallback; LONG ref; BOOL bInitialized; HANDLE hMutex; @@ -18,6 +19,10 @@ return (INetCfgImpl*)((char *)iface - FIELD_OFFSET(INetCfgImpl, lpVtblLock)); } +static __inline LPINetCfgImpl impl_from_INetCfgPnpReconfigCallback(INetCfgPnpReconfigCallback *iface) +{ + return (INetCfgImpl*)((char *)iface - FIELD_OFFSET(INetCfgImpl, lpVtblPnpReconfigCallback)); +} HRESULT @@ -159,6 +164,63 @@ INetCfgLock_fnReleaseWriteLock, INetCfgLock_fnIsWriteLocked }; + +/*************************************************************** + * INetCfgPnpReconfigCallback + */ + +HRESULT +WINAPI +INetCfgPnpReconfigCallback_fnQueryInterface( + INetCfgPnpReconfigCallback * iface, + REFIID iid, + LPVOID * ppvObj) +{ + INetCfgImpl * This = impl_from_INetCfgPnpReconfigCallback(iface); + return INetCfg_QueryInterface((INetCfg*)This, iid, ppvObj); +} + +ULONG +WINAPI +INetCfgPnpReconfigCallback_fnAddRef( + INetCfgPnpReconfigCallback * iface) +{ + INetCfgImpl * This = impl_from_INetCfgPnpReconfigCallback(iface); + + return INetCfg_AddRef((INetCfg*)This); +} + +ULONG +WINAPI +INetCfgPnpReconfigCallback_fnRelease( + INetCfgPnpReconfigCallback * iface) +{ + INetCfgImpl * This = impl_from_INetCfgPnpReconfigCallback(iface); + return INetCfg_Release((INetCfg*)This); +} + +HRESULT +WINAPI +INetCfgPnpReconfigCallback_fnSendPnpReconfig( + INetCfgPnpReconfigCallback * iface, + NCPNP_RECONFIG_LAYER Layer, + LPCWSTR pszwUpper, + LPCWSTR pszwLower, + PVOID pvData, + DWORD dwSizeOfData) +{ + /* FIXME */ + return E_NOTIMPL; +} + +static const INetCfgPnpReconfigCallbackVtbl vt_NetCfgPnpReconfigCallback = +{ + INetCfgPnpReconfigCallback_fnQueryInterface, + INetCfgPnpReconfigCallback_fnAddRef, + INetCfgPnpReconfigCallback_fnRelease, + INetCfgPnpReconfigCallback_fnSendPnpReconfig +}; + /*************************************************************** * INetCfg @@ -464,6 +526,15 @@ This->hMutex = CreateMutexW(NULL, FALSE, L"NetCfgLock"); INetCfgLock_AddRef(iface); + return S_OK; + } + else if (IsEqualIID (iid, &IID_INetCfgPnpReconfigCallback)) + { + if (This->bInitialized) + return NETCFG_E_ALREADY_INITIALIZED; + + *ppvObj = (LPVOID)&This->lpVtblPnpReconfigCallback; + INetCfgPnpReconfigCallback_AddRef(iface); return S_OK; } @@ -721,6 +792,7 @@ This->ref = 1; This->lpVtbl = (const INetCfg*)&vt_NetCfg; This->lpVtblLock = (const INetCfgLock*)&vt_NetCfgLock; + This->lpVtblPnpReconfigCallback = (const INetCfgPnpReconfigCallback*)&vt_NetCfgPnpReconfigCallback; This->hMutex = NULL; This->bInitialized = FALSE; This->pNet = NULL;

1 0

[hbelusca] 70378: Forgot this one...
by hbelusca＠svn.reactos.org 17 Dec '15

17 Dec '15

Author: hbelusca Date: Thu Dec 17 02:37:34 2015 New Revision: 70378 URL: http://svn.reactos.org/svn/reactos?rev=70378&view=rev Log: Forgot this one... Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] Thu Dec 17 02:37:34 2015 @@ -53,7 +53,7 @@ LTEXT "RÃ©glages liÃ©s Ã votre compte utilsateur.", IDC_STATIC, 16, 88, 210, 20 PUSHBUTTON "RÃ©glages", IDC_USERPROFILE, 194, 103, 50, 15 GROUPBOX "DÃ©marrage et RÃ©cupÃ©ration", IDC_STATIC, 6, 131, 244, 52 - LTEXT "Les option DÃ©marrage et RÃ©cupÃ©ration indiquent Ã l'ordinateur comment dÃ©marrer et quoi faire si une erreur empÃªche l'ordinateur de s'arrÃªter.", IDC_STATIC, 16, 144, 210, 30 + LTEXT "Les options DÃ©marrage et RÃ©cupÃ©ration indiquent Ã l'ordinateur comment dÃ©marrer et quoi faire si une erreur empÃªche l'ordinateur de s'arrÃªter.", IDC_STATIC, 16, 144, 210, 30 PUSHBUTTON "RÃ©glages", IDC_STAREC, 194, 162, 50, 15 PUSHBUTTON "System Settings", IDC_SYSSETTINGS, 6, 192, 80, 15 PUSHBUTTON "Variables d'en&vironnement", IDC_ENVVAR, 88, 192, 80, 15

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2015