Ros-diffs June 2007

ros-diffs@reactos.org

21 participants
420 discussions

[fireball] 27237: - Add bitmap font. - Add framebuffer way of video output. - Add a HACK to make bootvid.dll always use framebuffer and rely that the framebuffer is located at 0xFF000000. This is ONLY for OLPC branch. - With some changes in the kernel, we can already see a first "bsod" (it's black really now, but who cares :)).

by fireball＠svn.reactos.org

Author: fireball Date: Tue Jun 19 14:14:19 2007 New Revision: 27237 URL: http://svn.reactos.org/svn/reactos?rev=27237&view=rev Log: - Add bitmap font. - Add framebuffer way of video output. - Add a HACK to make bootvid.dll always use framebuffer and rely that the framebuffer is located at 0xFF000000. This is ONLY for OLPC branch. - With some changes in the kernel, we can already see a first "bsod" (it's black really now, but who cares :)). Added: branches/olpc/drivers/base/bootvid/bfont.c (with props) branches/olpc/drivers/base/bootvid/vid_fb.c (with props) Modified: branches/olpc/drivers/base/bootvid/bootvid.rbuild branches/olpc/drivers/base/bootvid/vid.c Added: branches/olpc/drivers/base/bootvid/bfont.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/bfont… ============================================================================== --- branches/olpc/drivers/base/bootvid/bfont.c (added) +++ branches/olpc/drivers/base/bootvid/bfont.c Tue Jun 19 14:14:19 2007 @@ -1,0 +1,285 @@ +/* $Id: xboxfont.c 21339 2006-03-18 22:09:16Z peterw $ + * + * Bootvid + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Note: Converted from the XFree vga.bdf font + */ + +#include "bootvid.h" + +UCHAR BitmapFont8x16[256 * 16] = +{ + 0x00,0x00,0x00,0x7c,0xc6,0xc6,0xde,0xde,0xde,0xdc,0xc0,0x7c,0x00,0x00,0x00,0x00, /* 0x00 */ + 0x00,0x00,0x7e,0x81,0xa5,0x81,0x81,0xa5,0x99,0x81,0x81,0x7e,0x00,0x00,0x00,0x00, /* 0x01 */ + 0x00,0x00,0x7e,0xff,0xdb,0xff,0xff,0xdb,0xe7,0xff,0xff,0x7e,0x00,0x00,0x00,0x00, /* 0x02 */ + 0x00,0x00,0x00,0x00,0x6c,0xfe,0xfe,0xfe,0xfe,0x7c,0x38,0x10,0x00,0x00,0x00,0x00, /* 0x03 */ + 0x00,0x00,0x00,0x00,0x10,0x38,0x7c,0xfe,0x7c,0x38,0x10,0x00,0x00,0x00,0x00,0x00, /* 0x04 */ + 0x00,0x00,0x00,0x18,0x3c,0x3c,0xe7,0xe7,0xe7,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* 0x05 */ + 0x00,0x00,0x00,0x18,0x3c,0x7e,0xff,0xff,0x7e,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* 0x06 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x3c,0x3c,0x18,0x00,0x00,0x00,0x00,0x00,0x00, /* 0x07 */ + 0xff,0xff,0xff,0xff,0xff,0xff,0xe7,0xc3,0xc3,0xe7,0xff,0xff,0xff,0xff,0xff,0xff, /* 0x08 */ + 0x00,0x00,0x00,0x00,0x00,0x3c,0x66,0x42,0x42,0x66,0x3c,0x00,0x00,0x00,0x00,0x00, /* 0x09 */ + 0xff,0xff,0xff,0xff,0xff,0xc3,0x99,0xbd,0xbd,0x99,0xc3,0xff,0xff,0xff,0xff,0xff, /* 0x0a */ + 0x00,0x00,0x1e,0x06,0x0e,0x1a,0x78,0xcc,0xcc,0xcc,0xcc,0x78,0x00,0x00,0x00,0x00, /* 0x0b */ + 0x00,0x00,0x3c,0x66,0x66,0x66,0x66,0x3c,0x18,0x7e,0x18,0x18,0x00,0x00,0x00,0x00, /* 0x0c */ + 0x00,0x00,0x3f,0x33,0x3f,0x30,0x30,0x30,0x30,0x70,0xf0,0xe0,0x00,0x00,0x00,0x00, /* 0x0d */ + 0x00,0x00,0x7f,0x63,0x7f,0x63,0x63,0x63,0x63,0x67,0xe7,0xe6,0xc0,0x00,0x00,0x00, /* 0x0e */ + 0x00,0x00,0x00,0x18,0x18,0xdb,0x3c,0xe7,0x3c,0xdb,0x18,0x18,0x00,0x00,0x00,0x00, /* 0x0f */ + 0x00,0x80,0xc0,0xe0,0xf0,0xf8,0xfe,0xf8,0xf0,0xe0,0xc0,0x80,0x00,0x00,0x00,0x00, /* 0x10 */ + 0x00,0x02,0x06,0x0e,0x1e,0x3e,0xfe,0x3e,0x1e,0x0e,0x06,0x02,0x00,0x00,0x00,0x00, /* 0x11 */ + 0x00,0x00,0x18,0x3c,0x7e,0x18,0x18,0x18,0x7e,0x3c,0x18,0x00,0x00,0x00,0x00,0x00, /* 0x12 */ + 0x00,0x00,0x66,0x66,0x66,0x66,0x66,0x66,0x66,0x00,0x66,0x66,0x00,0x00,0x00,0x00, /* 0x13 */ + 0x00,0x00,0x7f,0xdb,0xdb,0xdb,0x7b,0x1b,0x1b,0x1b,0x1b,0x1b,0x00,0x00,0x00,0x00, /* 0x14 */ + 0x00,0x7c,0xc6,0x60,0x38,0x6c,0xc6,0xc6,0x6c,0x38,0x0c,0xc6,0x7c,0x00,0x00,0x00, /* 0x15 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xfe,0xfe,0xfe,0x00,0x00,0x00,0x00, /* 0x16 */ + 0x00,0x00,0x18,0x3c,0x7e,0x18,0x18,0x18,0x7e,0x3c,0x18,0x7e,0x00,0x00,0x00,0x00, /* 0x17 */ + 0x00,0x00,0x18,0x3c,0x7e,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x00,0x00,0x00,0x00, /* 0x18 */ + 0x00,0x00,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x7e,0x3c,0x18,0x00,0x00,0x00,0x00, /* 0x19 */ + 0x00,0x00,0x00,0x00,0x00,0x18,0x0c,0xfe,0x0c,0x18,0x00,0x00,0x00,0x00,0x00,0x00, /* 0x1a */ + 0x00,0x00,0x00,0x00,0x00,0x30,0x60,0xfe,0x60,0x30,0x00,0x00,0x00,0x00,0x00,0x00, /* 0x1b */ + 0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xc0,0xc0,0xfe,0x00,0x00,0x00,0x00,0x00,0x00, /* 0x1c */ + 0x00,0x00,0x00,0x00,0x00,0x28,0x6c,0xfe,0x6c,0x28,0x00,0x00,0x00,0x00,0x00,0x00, /* 0x1d */ + 0x00,0x00,0x00,0x00,0x10,0x38,0x38,0x7c,0x7c,0xfe,0xfe,0x00,0x00,0x00,0x00,0x00, /* 0x1e */ + 0x00,0x00,0x00,0x00,0xfe,0xfe,0x7c,0x7c,0x38,0x38,0x10,0x00,0x00,0x00,0x00,0x00, /* 0x1f */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* */ + 0x00,0x00,0x18,0x3c,0x3c,0x3c,0x18,0x18,0x18,0x00,0x18,0x18,0x00,0x00,0x00,0x00, /* ! */ + 0x00,0x66,0x66,0x66,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* " */ + 0x00,0x00,0x00,0x6c,0x6c,0xfe,0x6c,0x6c,0x6c,0xfe,0x6c,0x6c,0x00,0x00,0x00,0x00, /* # */ + 0x18,0x18,0x7c,0xc6,0xc2,0xc0,0x7c,0x06,0x06,0x86,0xc6,0x7c,0x18,0x18,0x00,0x00, /* $ */ + 0x00,0x00,0x00,0x00,0xc2,0xc6,0x0c,0x18,0x30,0x60,0xc6,0x86,0x00,0x00,0x00,0x00, /* % */ + 0x00,0x00,0x38,0x6c,0x6c,0x38,0x76,0xdc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* & */ + 0x00,0x30,0x30,0x30,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* ' */ + 0x00,0x00,0x0c,0x18,0x30,0x30,0x30,0x30,0x30,0x30,0x18,0x0c,0x00,0x00,0x00,0x00, /* ( */ + 0x00,0x00,0x30,0x18,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x18,0x30,0x00,0x00,0x00,0x00, /* ) */ + 0x00,0x00,0x00,0x00,0x00,0x66,0x3c,0xff,0x3c,0x66,0x00,0x00,0x00,0x00,0x00,0x00, /* * */ + 0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x7e,0x18,0x18,0x00,0x00,0x00,0x00,0x00,0x00, /* + */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x18,0x30,0x00,0x00,0x00, /* , */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* - */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00, /* . */ + 0x00,0x00,0x00,0x00,0x02,0x06,0x0c,0x18,0x30,0x60,0xc0,0x80,0x00,0x00,0x00,0x00, /* / */ + 0x00,0x00,0x38,0x6c,0xc6,0xc6,0xd6,0xd6,0xc6,0xc6,0x6c,0x38,0x00,0x00,0x00,0x00, /* 0 */ + 0x00,0x00,0x18,0x38,0x78,0x18,0x18,0x18,0x18,0x18,0x18,0x7e,0x00,0x00,0x00,0x00, /* 1 */ + 0x00,0x00,0x7c,0xc6,0x06,0x0c,0x18,0x30,0x60,0xc0,0xc6,0xfe,0x00,0x00,0x00,0x00, /* 2 */ + 0x00,0x00,0x7c,0xc6,0x06,0x06,0x3c,0x06,0x06,0x06,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 3 */ + 0x00,0x00,0x0c,0x1c,0x3c,0x6c,0xcc,0xfe,0x0c,0x0c,0x0c,0x1e,0x00,0x00,0x00,0x00, /* 4 */ + 0x00,0x00,0xfe,0xc0,0xc0,0xc0,0xfc,0x06,0x06,0x06,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 5 */ + 0x00,0x00,0x38,0x60,0xc0,0xc0,0xfc,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 6 */ + 0x00,0x00,0xfe,0xc6,0x06,0x06,0x0c,0x18,0x30,0x30,0x30,0x30,0x00,0x00,0x00,0x00, /* 7 */ + 0x00,0x00,0x7c,0xc6,0xc6,0xc6,0x7c,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 8 */ + 0x00,0x00,0x7c,0xc6,0xc6,0xc6,0x7e,0x06,0x06,0x06,0x0c,0x78,0x00,0x00,0x00,0x00, /* 9 */ + 0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00,0x00, /* : */ + 0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x18,0x18,0x30,0x00,0x00,0x00,0x00, /* ; */ + 0x00,0x00,0x00,0x06,0x0c,0x18,0x30,0x60,0x30,0x18,0x0c,0x06,0x00,0x00,0x00,0x00, /* < */ + 0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* = */ + 0x00,0x00,0x00,0x60,0x30,0x18,0x0c,0x06,0x0c,0x18,0x30,0x60,0x00,0x00,0x00,0x00, /* > */ + 0x00,0x00,0x7c,0xc6,0xc6,0x0c,0x18,0x18,0x18,0x00,0x18,0x18,0x00,0x00,0x00,0x00, /* ? */ + 0x00,0x00,0x00,0x7c,0xc6,0xc6,0xde,0xde,0xde,0xdc,0xc0,0x7c,0x00,0x00,0x00,0x00, /* @ */ + 0x00,0x00,0x10,0x38,0x6c,0xc6,0xc6,0xfe,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00, /* A */ + 0x00,0x00,0xfc,0x66,0x66,0x66,0x7c,0x66,0x66,0x66,0x66,0xfc,0x00,0x00,0x00,0x00, /* B */ + 0x00,0x00,0x3c,0x66,0xc2,0xc0,0xc0,0xc0,0xc0,0xc2,0x66,0x3c,0x00,0x00,0x00,0x00, /* C */ + 0x00,0x00,0xf8,0x6c,0x66,0x66,0x66,0x66,0x66,0x66,0x6c,0xf8,0x00,0x00,0x00,0x00, /* D */ + 0x00,0x00,0xfe,0x66,0x62,0x68,0x78,0x68,0x60,0x62,0x66,0xfe,0x00,0x00,0x00,0x00, /* E */ + 0x00,0x00,0xfe,0x66,0x62,0x68,0x78,0x68,0x60,0x60,0x60,0xf0,0x00,0x00,0x00,0x00, /* F */ + 0x00,0x00,0x3c,0x66,0xc2,0xc0,0xc0,0xde,0xc6,0xc6,0x66,0x3a,0x00,0x00,0x00,0x00, /* G */ + 0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xfe,0xc6,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00, /* H */ + 0x00,0x00,0x3c,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* I */ + 0x00,0x00,0x1e,0x0c,0x0c,0x0c,0x0c,0x0c,0xcc,0xcc,0xcc,0x78,0x00,0x00,0x00,0x00, /* J */ + 0x00,0x00,0xe6,0x66,0x66,0x6c,0x78,0x78,0x6c,0x66,0x66,0xe6,0x00,0x00,0x00,0x00, /* K */ + 0x00,0x00,0xf0,0x60,0x60,0x60,0x60,0x60,0x60,0x62,0x66,0xfe,0x00,0x00,0x00,0x00, /* L */ + 0x00,0x00,0xc6,0xee,0xfe,0xfe,0xd6,0xc6,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00, /* M */ + 0x00,0x00,0xc6,0xe6,0xf6,0xfe,0xde,0xce,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00, /* N */ + 0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* O */ + 0x00,0x00,0xfc,0x66,0x66,0x66,0x7c,0x60,0x60,0x60,0x60,0xf0,0x00,0x00,0x00,0x00, /* P */ + 0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xd6,0xde,0x7c,0x0c,0x0e,0x00,0x00, /* Q */ + 0x00,0x00,0xfc,0x66,0x66,0x66,0x7c,0x6c,0x66,0x66,0x66,0xe6,0x00,0x00,0x00,0x00, /* R */ + 0x00,0x00,0x7c,0xc6,0xc6,0x60,0x38,0x0c,0x06,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* S */ + 0x00,0x00,0x7e,0x7e,0x5a,0x18,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* T */ + 0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* U */ + 0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x6c,0x38,0x10,0x00,0x00,0x00,0x00, /* V */ + 0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xd6,0xd6,0xd6,0xfe,0xee,0x6c,0x00,0x00,0x00,0x00, /* W */ + 0x00,0x00,0xc6,0xc6,0x6c,0x7c,0x38,0x38,0x7c,0x6c,0xc6,0xc6,0x00,0x00,0x00,0x00, /* X */ + 0x00,0x00,0x66,0x66,0x66,0x66,0x3c,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* Y */ + 0x00,0x00,0xfe,0xc6,0x86,0x0c,0x18,0x30,0x60,0xc2,0xc6,0xfe,0x00,0x00,0x00,0x00, /* Z */ + 0x00,0x00,0x3c,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x3c,0x00,0x00,0x00,0x00, /* [ */ + 0x00,0x00,0x00,0x80,0xc0,0xe0,0x70,0x38,0x1c,0x0e,0x06,0x02,0x00,0x00,0x00,0x00, /* \ */ + 0x00,0x00,0x3c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x3c,0x00,0x00,0x00,0x00, /* ] */ + 0x10,0x38,0x6c,0xc6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* ^ */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x00,0x00, /* _ */ + 0x30,0x30,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* ` */ + 0x00,0x00,0x00,0x00,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* a */ + 0x00,0x00,0xe0,0x60,0x60,0x78,0x6c,0x66,0x66,0x66,0x66,0x7c,0x00,0x00,0x00,0x00, /* b */ + 0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0xc0,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,0x00, /* c */ + 0x00,0x00,0x1c,0x0c,0x0c,0x3c,0x6c,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* d */ + 0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0xfe,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,0x00, /* e */ + 0x00,0x00,0x38,0x6c,0x64,0x60,0xf0,0x60,0x60,0x60,0x60,0xf0,0x00,0x00,0x00,0x00, /* f */ + 0x00,0x00,0x00,0x00,0x00,0x76,0xcc,0xcc,0xcc,0xcc,0xcc,0x7c,0x0c,0xcc,0x78,0x00, /* g */ + 0x00,0x00,0xe0,0x60,0x60,0x6c,0x76,0x66,0x66,0x66,0x66,0xe6,0x00,0x00,0x00,0x00, /* h */ + 0x00,0x00,0x18,0x18,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* i */ + 0x00,0x00,0x06,0x06,0x00,0x0e,0x06,0x06,0x06,0x06,0x06,0x06,0x66,0x66,0x3c,0x00, /* j */ + 0x00,0x00,0xe0,0x60,0x60,0x66,0x6c,0x78,0x78,0x6c,0x66,0xe6,0x00,0x00,0x00,0x00, /* k */ + 0x00,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* l */ + 0x00,0x00,0x00,0x00,0x00,0xec,0xfe,0xd6,0xd6,0xd6,0xd6,0xc6,0x00,0x00,0x00,0x00, /* m */ + 0x00,0x00,0x00,0x00,0x00,0xdc,0x66,0x66,0x66,0x66,0x66,0x66,0x00,0x00,0x00,0x00, /* n */ + 0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* o */ + 0x00,0x00,0x00,0x00,0x00,0xdc,0x66,0x66,0x66,0x66,0x66,0x7c,0x60,0x60,0xf0,0x00, /* p */ + 0x00,0x00,0x00,0x00,0x00,0x76,0xcc,0xcc,0xcc,0xcc,0xcc,0x7c,0x0c,0x0c,0x1e,0x00, /* q */ + 0x00,0x00,0x00,0x00,0x00,0xdc,0x76,0x66,0x60,0x60,0x60,0xf0,0x00,0x00,0x00,0x00, /* r */ + 0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0x60,0x38,0x0c,0xc6,0x7c,0x00,0x00,0x00,0x00, /* s */ + 0x00,0x00,0x10,0x30,0x30,0xfc,0x30,0x30,0x30,0x30,0x36,0x1c,0x00,0x00,0x00,0x00, /* t */ + 0x00,0x00,0x00,0x00,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* u */ + 0x00,0x00,0x00,0x00,0x00,0x66,0x66,0x66,0x66,0x66,0x3c,0x18,0x00,0x00,0x00,0x00, /* v */ + 0x00,0x00,0x00,0x00,0x00,0xc6,0xc6,0xd6,0xd6,0xd6,0xfe,0x6c,0x00,0x00,0x00,0x00, /* w */ + 0x00,0x00,0x00,0x00,0x00,0xc6,0x6c,0x38,0x38,0x38,0x6c,0xc6,0x00,0x00,0x00,0x00, /* x */ + 0x00,0x00,0x00,0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7e,0x06,0x0c,0xf8,0x00, /* y */ + 0x00,0x00,0x00,0x00,0x00,0xfe,0xcc,0x18,0x30,0x60,0xc6,0xfe,0x00,0x00,0x00,0x00, /* z */ + 0x00,0x00,0x0e,0x18,0x18,0x18,0x70,0x18,0x18,0x18,0x18,0x0e,0x00,0x00,0x00,0x00, /* { */ + 0x00,0x00,0x18,0x18,0x18,0x18,0x00,0x18,0x18,0x18,0x18,0x18,0x00,0x00,0x00,0x00, /* | */ + 0x00,0x00,0x70,0x18,0x18,0x18,0x0e,0x18,0x18,0x18,0x18,0x70,0x00,0x00,0x00,0x00, /* } */ + 0x00,0x00,0x76,0xdc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* ~ */ + 0x00,0x00,0x00,0x00,0x10,0x38,0x6c,0xc6,0xc6,0xc6,0xfe,0x00,0x00,0x00,0x00,0x00, /* 0x7f */ + 0x00,0x00,0x3c,0x66,0xc2,0xc0,0xc0,0xc0,0xc2,0x66,0x3c,0x0c,0x06,0x7c,0x00,0x00, /* 0x80 */ + 0x00,0x00,0xcc,0x00,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* 0x81 */ + 0x00,0x0c,0x18,0x30,0x00,0x7c,0xc6,0xfe,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0x82 */ + 0x00,0x10,0x38,0x6c,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* 0x83 */ + 0x00,0x00,0xcc,0x00,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* 0x84 */ + 0x00,0x60,0x30,0x18,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* 0x85 */ + 0x00,0x38,0x6c,0x38,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* 0x86 */ + 0x00,0x00,0x00,0x00,0x3c,0x66,0x60,0x60,0x66,0x3c,0x0c,0x06,0x3c,0x00,0x00,0x00, /* 0x87 */ + 0x00,0x10,0x38,0x6c,0x00,0x7c,0xc6,0xfe,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0x88 */ + 0x00,0x00,0xc6,0x00,0x00,0x7c,0xc6,0xfe,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0x89 */ + 0x00,0x60,0x30,0x18,0x00,0x7c,0xc6,0xfe,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0x8a */ + 0x00,0x00,0x66,0x00,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* 0x8b */ + 0x00,0x18,0x3c,0x66,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* 0x8c */ + 0x00,0x60,0x30,0x18,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* 0x8d */ + 0x00,0xc6,0x00,0x10,0x38,0x6c,0xc6,0xc6,0xfe,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00, /* 0x8e */ + 0x38,0x6c,0x38,0x00,0x38,0x6c,0xc6,0xc6,0xfe,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00, /* 0x8f */ + 0x18,0x30,0x60,0x00,0xfe,0x66,0x60,0x7c,0x60,0x60,0x66,0xfe,0x00,0x00,0x00,0x00, /* 0x90 */ + 0x00,0x00,0x00,0x00,0x00,0xcc,0x76,0x36,0x7e,0xd8,0xd8,0x6e,0x00,0x00,0x00,0x00, /* 0x91 */ + 0x00,0x00,0x3e,0x6c,0xcc,0xcc,0xfe,0xcc,0xcc,0xcc,0xcc,0xce,0x00,0x00,0x00,0x00, /* 0x92 */ + 0x00,0x10,0x38,0x6c,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0x93 */ + 0x00,0x00,0xc6,0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0x94 */ + 0x00,0x60,0x30,0x18,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0x95 */ + 0x00,0x30,0x78,0xcc,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* 0x96 */ + 0x00,0x60,0x30,0x18,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* 0x97 */ + 0x00,0x00,0xc6,0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7e,0x06,0x0c,0x78,0x00, /* 0x98 */ + 0x00,0xc6,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0x99 */ + 0x00,0xc6,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0x9a */ + 0x00,0x18,0x18,0x3c,0x66,0x60,0x60,0x60,0x66,0x3c,0x18,0x18,0x00,0x00,0x00,0x00, /* 0x9b */ + 0x00,0x38,0x6c,0x64,0x60,0xf0,0x60,0x60,0x60,0x60,0xe6,0xfc,0x00,0x00,0x00,0x00, /* 0x9c */ + 0x00,0x00,0x66,0x66,0x3c,0x18,0x7e,0x18,0x7e,0x18,0x18,0x18,0x00,0x00,0x00,0x00, /* 0x9d */ + 0x00,0xf8,0xcc,0xcc,0xf8,0xc4,0xcc,0xde,0xcc,0xcc,0xcc,0xc6,0x00,0x00,0x00,0x00, /* 0x9e */ + 0x00,0x0e,0x1b,0x18,0x18,0x18,0x7e,0x18,0x18,0x18,0x18,0x18,0xd8,0x70,0x00,0x00, /* 0x9f */ + 0x00,0x18,0x30,0x60,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* 0xa0 */ + 0x00,0x0c,0x18,0x30,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* 0xa1 */ + 0x00,0x18,0x30,0x60,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0xa2 */ + 0x00,0x18,0x30,0x60,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* 0xa3 */ + 0x00,0x00,0x76,0xdc,0x00,0xdc,0x66,0x66,0x66,0x66,0x66,0x66,0x00,0x00,0x00,0x00, /* 0xa4 */ + 0x76,0xdc,0x00,0xc6,0xe6,0xf6,0xfe,0xde,0xce,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00, /* 0xa5 */ + 0x00,0x3c,0x6c,0x6c,0x3e,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xa6 */ + 0x00,0x38,0x6c,0x6c,0x38,0x00,0x7c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xa7 */ + 0x00,0x00,0x30,0x30,0x00,0x30,0x30,0x60,0xc0,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0xa8 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xc0,0xc0,0xc0,0xc0,0x00,0x00,0x00,0x00,0x00, /* 0xa9 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x06,0x06,0x06,0x06,0x00,0x00,0x00,0x00,0x00, /* 0xaa */ + 0x00,0xc0,0xc0,0xc2,0xc6,0xcc,0x18,0x30,0x60,0xdc,0x86,0x0c,0x18,0x3e,0x00,0x00, /* 0xab */ + 0x00,0xc0,0xc0,0xc2,0xc6,0xcc,0x18,0x30,0x66,0xce,0x9e,0x3e,0x06,0x06,0x00,0x00, /* 0xac */ + 0x00,0x00,0x18,0x18,0x00,0x18,0x18,0x18,0x3c,0x3c,0x3c,0x18,0x00,0x00,0x00,0x00, /* 0xad */ + 0x00,0x00,0x00,0x00,0x00,0x36,0x6c,0xd8,0x6c,0x36,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xae */ + 0x00,0x00,0x00,0x00,0x00,0xd8,0x6c,0x36,0x6c,0xd8,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xaf */ + 0x11,0x44,0x11,0x44,0x11,0x44,0x11,0x44,0x11,0x44,0x11,0x44,0x11,0x44,0x11,0x44, /* 0xb0 */ + 0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa, /* 0xb1 */ + 0xdd,0x77,0xdd,0x77,0xdd,0x77,0xdd,0x77,0xdd,0x77,0xdd,0x77,0xdd,0x77,0xdd,0x77, /* 0xb2 */ + 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xb3 */ + 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xf8,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xb4 */ + 0x18,0x18,0x18,0x18,0x18,0xf8,0x18,0xf8,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xb5 */ + 0x36,0x36,0x36,0x36,0x36,0x36,0x36,0xf6,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xb6 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xb7 */ + 0x00,0x00,0x00,0x00,0x00,0xf8,0x18,0xf8,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xb8 */ + 0x36,0x36,0x36,0x36,0x36,0xf6,0x06,0xf6,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xb9 */ + 0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xba */ + 0x00,0x00,0x00,0x00,0x00,0xfe,0x06,0xf6,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xbb */ + 0x36,0x36,0x36,0x36,0x36,0xf6,0x06,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xbc */ + 0x36,0x36,0x36,0x36,0x36,0x36,0x36,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xbd */ + 0x18,0x18,0x18,0x18,0x18,0xf8,0x18,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xbe */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xbf */ + 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xc0 */ + 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xc1 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xc2 */ + 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x1f,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xc3 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xc4 */ + 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xff,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xc5 */ + 0x18,0x18,0x18,0x18,0x18,0x1f,0x18,0x1f,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xc6 */ + 0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x37,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xc7 */ + 0x36,0x36,0x36,0x36,0x36,0x37,0x30,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xc8 */ + 0x00,0x00,0x00,0x00,0x00,0x3f,0x30,0x37,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xc9 */ + 0x36,0x36,0x36,0x36,0x36,0xf7,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xca */ + 0x00,0x00,0x00,0x00,0x00,0xff,0x00,0xf7,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xcb */ + 0x36,0x36,0x36,0x36,0x36,0x37,0x30,0x37,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xcc */ + 0x00,0x00,0x00,0x00,0x00,0xff,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xcd */ + 0x36,0x36,0x36,0x36,0x36,0xf7,0x00,0xf7,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xce */ + 0x18,0x18,0x18,0x18,0x18,0xff,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xcf */ + 0x36,0x36,0x36,0x36,0x36,0x36,0x36,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xd0 */ + 0x00,0x00,0x00,0x00,0x00,0xff,0x00,0xff,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xd1 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xd2 */ + 0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xd3 */ + 0x18,0x18,0x18,0x18,0x18,0x1f,0x18,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xd4 */ + 0x00,0x00,0x00,0x00,0x00,0x1f,0x18,0x1f,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xd5 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3f,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xd6 */ + 0x36,0x36,0x36,0x36,0x36,0x36,0x36,0xff,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xd7 */ + 0x18,0x18,0x18,0x18,0x18,0xff,0x18,0xff,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xd8 */ + 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xd9 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xda */ + 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 0xdb */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 0xdc */ + 0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0, /* 0xdd */ + 0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f, /* 0xde */ + 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xdf */ + 0x00,0x00,0x00,0x00,0x00,0x76,0xdc,0xd8,0xd8,0xd8,0xdc,0x76,0x00,0x00,0x00,0x00, /* 0xe0 */ + 0x00,0x00,0x78,0xcc,0xcc,0xcc,0xd8,0xcc,0xc6,0xc6,0xc6,0xcc,0x00,0x00,0x00,0x00, /* 0xe1 */ + 0x00,0x00,0xfe,0xc6,0xc6,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0x00,0x00,0x00, /* 0xe2 */ + 0x00,0x00,0x00,0x00,0xfe,0x6c,0x6c,0x6c,0x6c,0x6c,0x6c,0x6c,0x00,0x00,0x00,0x00, /* 0xe3 */ + 0x00,0x00,0x00,0xfe,0xc6,0x60,0x30,0x18,0x30,0x60,0xc6,0xfe,0x00,0x00,0x00,0x00, /* 0xe4 */ + 0x00,0x00,0x00,0x00,0x00,0x7e,0xd8,0xd8,0xd8,0xd8,0xd8,0x70,0x00,0x00,0x00,0x00, /* 0xe5 */ + 0x00,0x00,0x00,0x00,0x66,0x66,0x66,0x66,0x66,0x7c,0x60,0x60,0xc0,0x00,0x00,0x00, /* 0xe6 */ + 0x00,0x00,0x00,0x00,0x76,0xdc,0x18,0x18,0x18,0x18,0x18,0x18,0x00,0x00,0x00,0x00, /* 0xe7 */ + 0x00,0x00,0x00,0x7e,0x18,0x3c,0x66,0x66,0x66,0x3c,0x18,0x7e,0x00,0x00,0x00,0x00, /* 0xe8 */ + 0x00,0x00,0x00,0x38,0x6c,0xc6,0xc6,0xfe,0xc6,0xc6,0x6c,0x38,0x00,0x00,0x00,0x00, /* 0xe9 */ + 0x00,0x00,0x38,0x6c,0xc6,0xc6,0xc6,0x6c,0x6c,0x6c,0x6c,0xee,0x00,0x00,0x00,0x00, /* 0xea */ + 0x00,0x00,0x1e,0x30,0x18,0x0c,0x3e,0x66,0x66,0x66,0x66,0x3c,0x00,0x00,0x00,0x00, /* 0xeb */ + 0x00,0x00,0x00,0x00,0x00,0x7e,0xdb,0xdb,0xdb,0x7e,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xec */ + 0x00,0x00,0x00,0x03,0x06,0x7e,0xdb,0xdb,0xf3,0x7e,0x60,0xc0,0x00,0x00,0x00,0x00, /* 0xed */ + 0x00,0x00,0x1c,0x30,0x60,0x60,0x7c,0x60,0x60,0x60,0x30,0x1c,0x00,0x00,0x00,0x00, /* 0xee */ + 0x00,0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00, /* 0xef */ + 0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0xfe,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00, /* 0xf0 */ + 0x00,0x00,0x00,0x00,0x18,0x18,0x7e,0x18,0x18,0x00,0x00,0xff,0x00,0x00,0x00,0x00, /* 0xf1 */ + 0x00,0x00,0x00,0x30,0x18,0x0c,0x06,0x0c,0x18,0x30,0x00,0x7e,0x00,0x00,0x00,0x00, /* 0xf2 */ + 0x00,0x00,0x00,0x0c,0x18,0x30,0x60,0x30,0x18,0x0c,0x00,0x7e,0x00,0x00,0x00,0x00, /* 0xf3 */ + 0x00,0x00,0x0e,0x1b,0x1b,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xf4 */ + 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xd8,0xd8,0xd8,0x70,0x00,0x00,0x00,0x00, /* 0xf5 */ + 0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x7e,0x00,0x18,0x18,0x00,0x00,0x00,0x00,0x00, /* 0xf6 */ + 0x00,0x00,0x00,0x00,0x00,0x76,0xdc,0x00,0x76,0xdc,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xf7 */ + 0x00,0x38,0x6c,0x6c,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xf8 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xf9 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xfa */ + 0x00,0x0f,0x0c,0x0c,0x0c,0x0c,0x0c,0xec,0x6c,0x6c,0x3c,0x1c,0x00,0x00,0x00,0x00, /* 0xfb */ + 0x00,0xd8,0x6c,0x6c,0x6c,0x6c,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xfc */ + 0x00,0x70,0xd8,0x30,0x60,0xc8,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xfd */ + 0x00,0x00,0x00,0x00,0x7c,0x7c,0x7c,0x7c,0x7c,0x7c,0x7c,0x00,0x00,0x00,0x00,0x00, /* 0xfe */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 /* 0xff */ +}; + +/* EOF */ + Propchange: branches/olpc/drivers/base/bootvid/bfont.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/olpc/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/bootv… ============================================================================== --- branches/olpc/drivers/base/bootvid/bootvid.rbuild (original) +++ branches/olpc/drivers/base/bootvid/bootvid.rbuild Tue Jun 19 14:14:19 2007 @@ -5,8 +5,10 @@ <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> + <file>bfont.c</file> <file>bootvid.c</file> <file>vid.c</file> + <file>vid_fb.c</file> <file>vid_vga.c</file> <file>vid_vgatext.c</file> <file>vid_xbox.c</file> Modified: branches/olpc/drivers/base/bootvid/vid.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/vid.c… ============================================================================== --- branches/olpc/drivers/base/bootvid/vid.c (original) +++ branches/olpc/drivers/base/bootvid/vid.c Tue Jun 19 14:14:19 2007 @@ -26,10 +26,23 @@ /* GLOBALS *******************************************************************/ -static PVID_FUNCTION_TABLE VidTable; +extern VID_FUNCTION_TABLE VidFramebufTable; extern VID_FUNCTION_TABLE VidVgaTable; extern VID_FUNCTION_TABLE VidVgaTextTable; extern VID_FUNCTION_TABLE VidXboxTable; +static PVID_FUNCTION_TABLE VidTable = &VidFramebufTable; + +ULONG ScrollRegion[4] = +{ + 0, + 0, + 640 - 1, + 480 - 1 +}; + +ULONG TextColor = 0xFFFF; +ULONG curr_x = 0, curr_y = 0; +BOOLEAN NextLine = FALSE; /* FUNCTIONS *****************************************************************/ @@ -37,6 +50,7 @@ VidInitialize( IN BOOLEAN SetMode) { +#if I_FINISHED_DEVELOPING ULONG PciId; /* @@ -50,8 +64,12 @@ VidTable = &VidXboxTable; else if (SetMode) VidTable = &VidVgaTable; - /*else - VidTable = &VidVgaTextTable;*/ + else + VidTable = &VidVgaTextTable; +#else + VidTable = &VidFramebufTable; +#endif + return VidTable->Initialize(SetMode); } @@ -124,7 +142,19 @@ IN ULONG x2, IN ULONG y2) { - // UNIMPLEMENTED + /* Assert alignment */ + ASSERT((x1 & 0x7) == 0); + ASSERT((x2 & 0x7) == 7); + + /* Set Scroll Region */ + ScrollRegion[0] = x1; + ScrollRegion[1] = y1; + ScrollRegion[2] = x2; + ScrollRegion[3] = y2; + + /* Set current X and Y */ + curr_x = x1; + curr_y = y1; } VOID NTAPI @@ -133,12 +163,16 @@ IN ULONG Top, IN BOOLEAN Transparent) { - // UNIMPLEMENTED + VidTable->DisplayStringXY(String, Left, Top, Transparent); } ULONG NTAPI VidSetTextColor(IN ULONG Color) { - // UNIMPLEMENTED - return 0; // FIXME: Return old text color + ULONG OldColor; + + /* Save the old color and set the new one */ + OldColor = TextColor; + TextColor = Color; + return OldColor; } Added: branches/olpc/drivers/base/bootvid/vid_fb.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/vid_f… ============================================================================== --- branches/olpc/drivers/base/bootvid/vid_fb.c (added) +++ branches/olpc/drivers/base/bootvid/vid_fb.c Tue Jun 19 14:14:19 2007 @@ -1,0 +1,252 @@ +/* + * ReactOS Boot video driver + * + * Copyright (C) 2004-2007 Filip Navara, Aleksey Bragin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +/* INCLUDES ******************************************************************/ + +#include "bootvid.h" +#define NDEBUG +#include <debug.h> + +extern ULONG ScrollRegion[4]; +extern ULONG TextColor, curr_x, curr_y; +extern BOOLEAN NextLine; + +extern UCHAR BitmapFont8x16[256 * 16]; + +//static BOOLEAN VidpInitialized = FALSE; +static PUCHAR VidpMemory = (VOID *)0xFF000000; + +#define CHAR_WIDTH 8 +#define CHAR_HEIGHT 16 +#define TOP_BOTTOM_LINES 0 + +#define DISPLAY_WIDTH 1200 + +UCHAR BytesPerPixel = 2; + +/* PRIVATE FUNCTIONS **********************************************************/ + +VOID +NTAPI +DisplayCharacter(CHAR Character, + ULONG Left, + ULONG Top, + ULONG TextColor, + ULONG BackTextColor) +{ + PUCHAR FontPtr; + WORD *Pixel; + UCHAR Mask; + ULONG Stride = DISPLAY_WIDTH * BytesPerPixel; + unsigned Line; + unsigned Col; + + //HACK + TextColor = 0xFFFF; + BackTextColor = 0; + + FontPtr = BitmapFont8x16 + Character * 16; + Pixel = (WORD *) ((char *) VidpMemory + (Top + TOP_BOTTOM_LINES) * Stride + + Left * BytesPerPixel); + for (Line = 0; Line < CHAR_HEIGHT; Line++) + { + Mask = 0x80; + for (Col = 0; Col < CHAR_WIDTH; Col++) + { + Pixel[Col] = (0 != (FontPtr[Line] & Mask) ? TextColor : BackTextColor); + Mask = Mask >> 1; + } + Pixel = (WORD *) ((char *) Pixel + Stride); + } +} + + +/* PUBLIC FUNCTIONS ***********************************************************/ + +static BOOLEAN NTAPI +VidFbInitialize( + IN BOOLEAN SetMode) +{ +#if 0 + PHYSICAL_ADDRESS PhysicalAddress; + + if (!VidpInitialized) + { + PhysicalAddress.QuadPart = 0xFD000000; + VidpMemory = MmMapIoSpace(PhysicalAddress, 0x200000, MmNonCached); + if (VidpMemory == NULL) + return FALSE; + + memset(VidpMemory, 0x00, 0x200000); + //memset((VOID *)0xFF000000, 0x90, 1024*1024); + + VidpInitialized = TRUE; + } +#endif + return TRUE; +} + +static VOID NTAPI +VidFbResetDisplay(VOID) +{ +} + +static VOID NTAPI +VidFbCleanUp(VOID) +{ +} + +static VOID NTAPI +VidFbBufferToScreenBlt( + IN PUCHAR Buffer, + IN ULONG Left, + IN ULONG Top, + IN ULONG Width, + IN ULONG Height, + IN ULONG Delta) +{ +} + +static VOID NTAPI +VidFbScreenToBufferBlt( + OUT PUCHAR Buffer, + IN ULONG Left, + IN ULONG Top, + IN ULONG Width, + IN ULONG Height, + IN LONG Delta) +{ +} + +static VOID NTAPI +VidFbBitBlt( + IN PUCHAR Buffer, + IN ULONG Left, + IN ULONG Top) +{ +} + +static VOID NTAPI +VidFbSolidColorFill( + IN ULONG Left, + IN ULONG Top, + IN ULONG Right, + IN ULONG Bottom, + IN ULONG Color) +{ +} + +static VOID NTAPI +VidFbDisplayString( + IN PCSTR String) +{ + ULONG TopDelta = 14; + + /* Start looping the string */ + while (*String) + { + /* Treat new-line separately */ + if (*String == '\n') + { + /* Modify Y position */ + curr_y += TopDelta; + if (curr_y >= ScrollRegion[3]) + { + /* Scroll the view */ + //VgaScroll(TopDelta); + curr_y -= TopDelta; + + /* Preserve row */ + //PreserveRow(curr_y, TopDelta, TRUE); + } + + /* Update current X */ + curr_x = ScrollRegion[0]; + + /* Preseve the current row */ + //PreserveRow(curr_y, TopDelta, FALSE); + } + else if (*String == '\r') + { + /* Update current X */ + curr_x = ScrollRegion[0]; + + /* Check if we're being followed by a new line */ + if (String[1] != '\n') NextLine = TRUE; + } + else + { + /* Check if we had a \n\r last time */ + if (NextLine) + { + /* We did, preserve the current row */ + //PreserveRow(curr_y, TopDelta, TRUE); + NextLine = FALSE; + } + + /* Display this character */ + DisplayCharacter(*String, curr_x, curr_y, TextColor, 16); + curr_x += 8; + + /* Check if we should scroll */ + if (curr_x > ScrollRegion[2]) + { + /* Update Y position and check if we should scroll it */ + curr_y += TopDelta; + if (curr_y > ScrollRegion[3]) + { + /* Do the scroll */ + //VgaScroll(TopDelta); + curr_y -= TopDelta; + + /* Save the row */ + //PreserveRow(curr_y, TopDelta, TRUE); + } + + /* Update X */ + curr_x = ScrollRegion[0]; + } + } + + /* Get the next character */ + String++; + } +} + +static VOID NTAPI +VidFbDisplayStringXY( + IN PUCHAR String, + IN ULONG Top, + IN ULONG Left, + IN BOOLEAN Transparent) +{ +} + +VID_FUNCTION_TABLE VidFramebufTable = { + VidFbInitialize, + VidFbCleanUp, + VidFbResetDisplay, + VidFbBufferToScreenBlt, + VidFbScreenToBufferBlt, + VidFbBitBlt, + VidFbSolidColorFill, + VidFbDisplayString, + VidFbDisplayStringXY +}; Propchange: branches/olpc/drivers/base/bootvid/vid_fb.c ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 6 months

[fireball] 27236: - Russian language translation by Dmitry Chapyshev.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Jun 19 12:40:36 2007 New Revision: 27236 URL: http://svn.reactos.org/svn/reactos?rev=27236&view=rev Log: - Russian language translation by Dmitry Chapyshev. Added: trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/ru-RU.rc Modified: trunk/reactos/subsystems/ntvdm/ntvdm.rc trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc Added: trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/ru-R… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc (added) +++ trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc Tue Jun 19 12:40:36 2007 @@ -1,0 +1,13 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + +STRING_WelcomeMsg, "Âèðòóàëüíàÿ ìàøèíà ïîääåæêè DOS äëÿ ReactOS.\n" +STRING_PromptMsg, "Ââåäèòå r<cr> äëÿ çàïóñêà, s<cr> äëÿ âûêëþ÷åíèÿ èëè q<cr> âûõîäà." +} Modified: trunk/reactos/subsystems/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.rc?… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.rc (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.rc Tue Jun 19 12:40:36 2007 @@ -18,3 +18,4 @@ #include "lang/th-TH.rc" #include "lang/uk-UA.rc" #include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" Added: trunk/reactos/subsystems/win32/csrss/win32csr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/ru-RU.rc (added) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/ru-RU.rc Tue Jun 19 12:40:36 2007 @@ -1,0 +1,48 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_END_NOW DIALOG DISCARDABLE 0, 0, 200, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Çàâåðøåíèå ïðîãðàììû - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Çàâåðøåíèå ïðîãðàììû... Ïàæàëóéñòà ïîäîæäèòå",IDC_STATIC,7,7,186,11 + CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Åñëè âû çàâåðøèòå ïðîãðàììó ñåé÷àñ, òî âû ìîæåòå ïîòåðÿòü íåñîõðàíåííûå äàííûå. ×òîáû çàâåøèòü ïðîãðàììó ñåé÷àñ íàæìèòå Çàâåðøèòü", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&Çàâåøèòü",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOG DISCARDABLE 0, 0, 192, 122 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Çàâåðøåíèå ïðîãðàììû - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Îòìåíà",IDCANCEL,142,98,43,17 + PUSHBUTTON "&Çàâåðøèòü",IDC_END_NOW,78,98,43,17 + LTEXT "Ýòà ïðîãðàììà íå îòâå÷àåò",IDC_STATIC,7,7,178,8 + LTEXT "Äëÿ âîçâðàòà â ReactOS è ñîõðàíåíèÿ äàííûõ íàæìèòå Îòìåíà", + IDC_STATIC,7,26,178,16 + LTEXT "Åñëè âû çàâåðøèòå ïðîãðàììó ñåé÷àñ, òî âû ìîæåòå ïîòåðÿòü íåñîõðàíåííûå äàííûå. ×òîáû çàâåøèòü ïðîãðàììó ñåé÷àñ íàæìèòå Çàâåðøèòü", + IDC_STATIC,7,53,178,26 +END + +STRINGTABLE +BEGIN + IDS_EDIT "Ðåäàêòèðîâàòü" + IDS_MARK "Ïîìåòèòü" + IDS_COPY "Êîïèðîâàòü\tEnter" + IDS_PASTE "Âñòàâèòü" + IDS_SELECTALL "Âûäåëèòü âñå" + IDS_SCROLL "Ïðîêðóòèòü" + IDS_FIND "Èñêàòü..." + IDS_DEFAULTS "Defaults" + IDS_PROPERTIES "Ñâîéñòâà" + IDS_SCROLLHERE "Scroll Here" + IDS_SCROLLTOP "Scroll Top" + IDS_SCROLLBOTTOM "Ïðîêðóòèòü âíèç" + IDS_SCROLLPAGE_UP "Page Up" + IDS_SCROLLPAGE_DOWN "Page Down" + IDS_SCROLLUP "Ïðîêðóòèòü ââåðõ" + IDS_SCROLLDOWN "Scroll Down" +END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc Tue Jun 19 12:40:36 2007 @@ -10,3 +10,4 @@ #include "lang/it-IT.rc" #include "lang/pl-PL.rc" #include "lang/uk-UA.rc" +#include "lang/ru-RU.rc"

17 years, 6 months

[fireball] 27235: - Russian language translation and fixes to existing translation by Dmitry Chapyshev.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Jun 19 12:37:36 2007 New Revision: 27235 URL: http://svn.reactos.org/svn/reactos?rev=27235&view=rev Log: - Russian language translation and fixes to existing translation by Dmitry Chapyshev. Added: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc (with props) trunk/reactos/dll/win32/netid/lang/ru-RU.rc (with props) trunk/reactos/dll/win32/serialui/lang/ru-RU.rc (with props) trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc (with props) trunk/reactos/dll/win32/user32/Ru.rc Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/intl/lang/ru-RU.rc trunk/reactos/dll/cpl/main/lang/ru-RU.rc trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc trunk/reactos/dll/cpl/powercfg/resources/acdc.ico trunk/reactos/dll/cpl/powercfg/resources/dc.ico trunk/reactos/dll/cpl/powercfg/resources/screen.ico trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/netid/netid.rc trunk/reactos/dll/win32/serialui/serialui.rc trunk/reactos/dll/win32/syssetup/syssetup.rc trunk/reactos/dll/win32/user32/user32.rc Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ru-RU.rc Tue Jun 19 12:37:36 2007 @@ -8,11 +8,11 @@ BEGIN GROUPBOX "Çàëèïàíèå êëàâèø",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Ââîä ñî÷åòàíèé ñ êëàâèøàìè Shift, Ctrl èëè Alt ïóòåì ïîñëåäîâàòåëüíîãî íàæàòèÿ êëàâèø.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "&Çàëèïàíèå êëàâèø",IDC_STICKY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "&Çàëèïàíèå êëàâèø",IDC_STICKY_BOX,PROPSHEETPADDING(4),LABELLINE(5)-12,PROPSHEETPADDING(15),14 PUSHBUTTON "&Íàñòðîéêà",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 GROUPBOX "Ôèëüòðàöèÿ ââîäà",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 LTEXT "Èãíîðèðîâàíèå ñëó÷àéíûõ êðàòêîâðåìåííûõ èëè ïîâòîðíûõ íàæàòèé êëàâèø.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Èñïîëüçîâàòü &Ôèëüòðàöèþ ââîäà",IDC_FILTER_BOX,PROPSHEETPADDING(4),LABELLINE(13)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "Èñïîëüçîâàòü &ôèëüòðàöèþ ââîäà",IDC_FILTER_BOX,PROPSHEETPADDING(4),LABELLINE(13)-15,PROPSHEETPADDING(15)+50,14 PUSHBUTTON "Í&àñòðîéêà",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 GROUPBOX "Îçâó÷èâàíèå ïåðåêëþ÷åíèÿ ðåæèìîâ",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Îçâó÷èâàíèå íàæàòèÿ êëàâèø ïåðåêëþ÷åíèÿ ðåæèìîâ Caps Lock, Num Lock è Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) @@ -29,8 +29,8 @@ BEGIN GROUPBOX "Âèçóàëüíîå îïîâåùåíèå",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "Ñîïðîâîæäåíèå çâóêîâûõ ñèãíàëîâ âèçóàëüíûì îïîâåùåíèåì.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Â&èçóàëüíîå îïîâåùåíèå",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + AUTOCHECKBOX "Â&èçóàëüíîå îïîâåùåíèå",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15)+2,14 + LTEXT "Îïîâåùåíèå ïîëüçîâàòåëÿ:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Ñóáòèòðû",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 @@ -46,7 +46,7 @@ BEGIN GROUPBOX "Âûñîêàÿ êîíòðàñòíîñòü",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Îñîáî ïîäîáðàííûå ñî÷åòàíèÿ öâåòîâ è øðèôòîâ, îáëåã÷àþùèå âîñïðèÿòèå.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "&Âûñîêàÿ êîíòðàñòíîñòü",IDC_CONTRAST_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "&Âûñîêàÿ êîíòðàñòíîñòü",IDC_CONTRAST_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15)+5,14 PUSHBUTTON "&Íàñòðîéêà",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 END @@ -59,7 +59,7 @@ BEGIN GROUPBOX "Óïðàâëåíèå óêàçàòåëåì ñ êëàâèàòóðû",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Óïðàâëåíèå óêàçàòåëåì ñ öèôðîâîé ïàíåëè êëàâèàòóðû.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "&Óïðàâëåíèå ñ êëàâèàòóðû",IDC_MOUSE_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "&Óïðàâëåíèå ñ êëàâèàòóðû",IDC_MOUSE_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15)+7,14 PUSHBUTTON "&Íàñòðîéêà",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 END @@ -73,7 +73,7 @@ AUTOCHECKBOX "&Îòêëþ÷àòü ïðè ïðîñòîå â òå÷åíèå:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) + LTEXT "Ìèíóòû",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Óâåäîìëåíèå",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "Âûäàâàòü ñîîáùåíèå ïðè âêëþ÷åíèè &ðåæèìà",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 @@ -93,15 +93,15 @@ IDD_STICKYKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Sticky Keys Settings" +CAPTION "Íàñòðîéêà ðåæèìà çàëèïàíèÿ êëàâèø" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + GROUPBOX "Êëàâèøè",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Íàæàòèå êëàâèøè SHIFT 5 ðàç àêòèâèðóåò çàëèïàíèå êëàâèø.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Àêòèâèðîâàòü çàëèïàíèå êëàâèø",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -110,8 +110,8 @@ IDS_CPLSYSTEMNAME "Ñïåöèàëüíûå âîçìîæíîñòè" IDS_CPLSYSTEMDESCRIPTION "Íàñòðîéêà ñïåöèàëüíûõ âîçìîæíîñòåé Âàøåãî êîìïüþòåðà." - IDS_SENTRY_NONE "[None]" - IDS_SENTRY_TITLE "Flash the titlebar" - IDS_SENTRY_WINDOW "Flash the active window" - IDS_SENTRY_DISPLAY "Flash the desktop" + IDS_SENTRY_NONE "[íåò]" + IDS_SENTRY_TITLE "Ïîäñâå÷èâàòü çàãîëîâê" + IDS_SENTRY_WINDOW "Ïîäñâå÷èâàòü àêòèâíîå îêíî" + IDS_SENTRY_DISPLAY "Ïîäñâå÷èâàòü ðàáî÷èé ñòîë" END Modified: trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc Tue Jun 19 12:37:36 2007 @@ -11,7 +11,7 @@ LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 - CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 + CONTROL "&Ïîêàçàòü îáíîâëåíèÿ",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "×òîáû óñòàíîâèòü ïðîãðàììó èëè èçìåíèòü å¸ óñòàíîâëåííûå êîìïîíåíòû, âûäåëèòå å¸ â ñïèñêå è íàæìèòå ""Çàìåíèòü/Óäàëèòü"".",-1,36,72,PROPSHEETWIDTH-48,32 LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Çàìåíèòü/Óäàëèòü", IDC_ADDREMOVE, PROPSHEETWIDTH-98, 200, 85, 14 @@ -27,7 +27,7 @@ IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Create link" +CAPTION "Ñîçäàòü ññûëêó" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Text1", -1, 115, 15, 160, 24 @@ -36,7 +36,7 @@ IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Create link" +CAPTION "Ñîçäàòü ññûëêó" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Text1",-1,10,0,225,40 Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc Tue Jun 19 12:37:36 2007 @@ -2,7 +2,7 @@ IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Ôîí" +CAPTION "Ðàáî÷èé ñòîë" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, @@ -21,27 +21,27 @@ IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Screensaver" +CAPTION "Çàñòàâêà" FONT 8, "MS Shell Dlg", 0, 0 BEGIN CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE - GROUPBOX "&Screensaver",IDC_SCREENS_DUMMY, 8, 92, 230, 52 - COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Se&ttings",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP - PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC, 175, 103, 50, 13 - LTEXT "&Wait",IDC_WAITTEXT, 14, 125, 16, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP + GROUPBOX "&Çàñòàâêà",IDC_SCREENS_DUMMY, 7, 92, 231, 52 + COMBOBOX IDC_SCREENS_LIST, 14, 104, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Ïàðàìåòðû",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP + PUSHBUTTON "Ï&ðîñìîòð",IDC_SCREENS_TESTSC, 175, 103, 50, 13 + LTEXT "È&íòåðâàë",IDC_WAITTEXT, 14, 125, 33, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 60, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 54, 123, 12, 13 - LTEXT "minutes", IDC_MINTEXT, 70, 125, 26, 9 - CONTROL "Ask for &password on resume.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 - GROUPBOX "&Energy Saving features of monitor", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 - LTEXT "To adjust the power settings for your monitor, click on Power Settings.", + LTEXT "ìèí.", IDC_MINTEXT, 95, 125, 26, 9 + CONTROL "Íà&÷èíàòü ñ ýêðàíà ïðèâåòñòâèÿ",IDC_SCREENS_USEPASSCHK,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 118, 115, 23 + GROUPBOX "&Ýíåðãîñáåðåæåíèå", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + LTEXT "Äëÿ èçìåíåíèÿ ïàðàìåòðîâ ïèòàíèÿ ìîíèòîðà íàæìèòå êíîïêó ""Ïèòàíèå"".", IDC_STATIC, 14, 166, 146 ,20 - PUSHBUTTON "P&ower...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 + PUSHBUTTON "Ï&èòàíèå...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -51,94 +51,94 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 + LTEXT "Öâåòîâàÿ ñõåìà", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "Äîïîëíèòåëüíî", IDC_APPEARANCE_ADVANCED, 178, 150, 60, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Advanced Appearance" +CAPTION "Äîïîëíèòåëüíîå îôîðìëåíèå" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Element:", 8, 5, 160, 50, 9 + LTEXT "Ýëåìåíò:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + LTEXT "&Ðàçìåð", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 - LTEXT "&1st Color:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + LTEXT "Öâåò &1:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "&2nd Color:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + LTEXT "Öâåò &2:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 + LTEXT "Øðèôò:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 + LTEXT "Ðàçìåð:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL - LTEXT "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 + LTEXT "Öâåò:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP - AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE - AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + AUTOCHECKBOX "Æ", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE + AUTOCHECKBOX "Ê ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Íàñòðîéêè" +CAPTION "Ïàðàìåòðû" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Äèñïëåé:",1820,3,100,30,8 LTEXT "<íåò>",IDC_SETTINGS_DEVICE,9,109,224,8 - GROUPBOX "&Îáëàñòü ýêðàíà",1818,3,120,119,43 + GROUPBOX "&Ðàçðåøåíèå ýêðàíà",1818,3,120,119,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP,33,130,58,17 LTEXT "Ìåíüøå",1815,7,130,27,8,NOT WS_GROUP LTEXT "Áîëüøå",1816,91,130,27,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Öâåòà",1817,125,120,115,43 + GROUPBOX "&Êà÷åñòâî öâåòîïåðåäà÷è",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 - PUSHBUTTON "Äî&ïîëíèòåëüíî...",IDC_SETTINGS_ADVANCED,306,165,56,14 + PUSHBUTTON "Äî&ïîëíèòåëüíî",IDC_SETTINGS_ADVANCED,306,165,56,14 END IDR_PREVIEW_MENU MENU BEGIN - MENUITEM "Normal", ID_MENU_NORMAL - MENUITEM "Disabled", ID_MENU_DISABLED - MENUITEM "Selected", ID_MENU_SELECTED + MENUITEM "Îáû÷íàÿ", ID_MENU_NORMAL + MENUITEM "Îòêëþ÷åííàÿ", ID_MENU_DISABLED + MENUITEM "Âûáðàííàÿ", ID_MENU_SELECTED END STRINGTABLE BEGIN - IDS_CPLNAME "Äèñïëåé" + IDS_CPLNAME "Ýêðàí" IDS_CPLDESCRIPTION "Âûáåðèòå äèñïëåé ðàáî÷åãî ñòîëà è çàñòàâêó." IDS_NONE "(íåò)" - IDS_CENTER "Ïî öåíòðó" - IDS_STRETCH "Ðàñòÿíóòü" - IDS_TILE "Ïîâòîðÿòü" + IDS_CENTER "ïî öåíòðó" + IDS_STRETCH "ðàñòÿíóòü" + IDS_TILE "çàìîñòèòü" END STRINGTABLE DISCARDABLE BEGIN IDS_COLOR_4BIT "16 öâåòîâ" IDS_COLOR_8BIT "256 öâåòîâ" - IDS_COLOR_16BIT "High Color (16 áèò)" - IDS_COLOR_24BIT "True Color (24 áèòà)" - IDS_COLOR_32BIT "True Color (32 áèòà)" + IDS_COLOR_16BIT "Ñðåäíåå (16 áèò)" + IDS_COLOR_24BIT "Âûñîêîå (24 áèòà)" + IDS_COLOR_32BIT "Ñàìîå âûñîêîå (32 áèòà)" IDS_PIXEL "%lux%lu òî÷åê" END @@ -150,36 +150,36 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_INACTWIN "Inactive Window" - IDS_ACTWIN "Active Window" - IDS_WINTEXT "Window Text" - IDS_MESSBOX "Message Box" - IDS_MESSTEXT "Message Text" + IDS_INACTWIN "Íåàêòèâíîå îêíî" + IDS_ACTWIN "Àêòèâíîå îêíî" + IDS_WINTEXT "Òåêñò îêíà" + IDS_MESSBOX "Îêíî ñîîáùåíèÿ" + IDS_MESSTEXT "Ñîîáùåíèå" IDS_BUTTEXT "OK" END STRINGTABLE DISCARDABLE BEGIN - IDS_ELEMENT_1 "Desktop" - IDS_ELEMENT_2 "Caption of inactive windows" - IDS_ELEMENT_3 "Border of inactive windows" - IDS_ELEMENT_4 "Caption of active windows" - IDS_ELEMENT_5 "Border of active windows" - IDS_ELEMENT_6 "Menu" - IDS_ELEMENT_7 "Hilited elements" - IDS_ELEMENT_8 "Windows" - IDS_ELEMENT_9 "Scrollbars" - IDS_ELEMENT_10 "3D objects" - IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_1 "Ðàáî÷èé ñòîë" + IDS_ELEMENT_2 "Çàãîëîâîê àêòèâíîãî îêíà" + IDS_ELEMENT_3 "Ãðàíèöà íåàêòèâíîãî îêíà" + IDS_ELEMENT_4 "Ãðàíèöà àêòèâíîãî îêíà" + IDS_ELEMENT_5 "Ãðàíèöà àêòèâíîãî îêíà" + IDS_ELEMENT_6 "Ìåíþ" + IDS_ELEMENT_7 "Âñïëûâàþùàÿ ïîäñêàçêà" + IDS_ELEMENT_8 "Îêíà" + IDS_ELEMENT_9 "Ïîëîñà ïðîêðóòêè" + IDS_ELEMENT_10 "Ðåëüåôíûå îáúåêòû" + IDS_ELEMENT_11 "Öâåò çàãîëîâêà" + IDS_ELEMENT_12 "Çíà÷îê çàãîëîâêà" IDS_ELEMENT_13 "Captionbar" - IDS_ELEMENT_14 "Deactivated menu elements" - IDS_ELEMENT_15 "Dialog" + IDS_ELEMENT_14 "Âûäåëåííûé ïóíêò ìåíþ" + IDS_ELEMENT_15 "Äèàëîã" IDS_ELEMENT_16 "Scrollbar controls" - IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_17 "Ðàáî÷àÿ îáëàñòü ïðèëîæåíèÿ" IDS_ELEMENT_18 "Small captionbar" - IDS_ELEMENT_19 "Symbol distance (horizontal)" - IDS_ELEMENT_20 "Symbol distance (vertical)" + IDS_ELEMENT_19 "Èíòåðâàë ìåæäó çíà÷êàìè (ãîð.)" + IDS_ELEMENT_20 "Èíòåðâàë ìåæäó çíà÷êàìè (âåðò.)" IDS_ELEMENT_21 "Quickinfo" - IDS_ELEMENT_22 "Symbol" + IDS_ELEMENT_22 "Çíà÷îê" END Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/ru-RU.rc Tue Jun 19 12:37:36 2007 @@ -23,28 +23,28 @@ IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Äåíåæíàÿ åäèíèöà" +CAPTION "Äåíåæíûå åäèíèöû" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE - LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + GROUPBOX "Îáðàçöû", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Ïîëîæ.:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Îòðèö.:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Î&áîçí. äíåæíîé åäåíèöû:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYSYMBOL, 134, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Ôîðìàò &ïîëîæ. äåíåæíûõ ñóìì:", -1, 20, 68, 109, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYPOSVALUE, 134, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Ôîðìàò &îòðèö. äåíåæíûõ ñóìì:", -1, 20, 85, 109, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYNEGVALUE, 134, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Ðàçäåë. öåëîé è äðîáíîé ÷àñòè:", -1, 20, 111, 109, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECSEP, 134, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Êîëè÷åñòâî äðîáíûõ çíàêîâ:", -1, 20, 128, 109, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECNUM, 134, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Ðàçäåëèòåëü &ãðóïï ðàçðÿäîâ:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPSEP, 134, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Êîëè÷åñòâî &öèôð â ãðóïïå:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPNUM, 134, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -54,22 +54,22 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Îôîðìëåíèå", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE - LTEXT "Îáðàçåö:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "&Ôîðìàò âðåìåíè:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "&Ðàçäåëèòåëü êîìïîíåíòîâ âðåìåíè:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Î&áîçíà÷åíèå âðåìåíè äî ïîëóäíÿ (AM):", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Îáî&çíà÷åíèå âðåìåíè ïîñëå ïîëóäíÿ (PM):", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE + LTEXT "Îáðàçåö:", -1, 10, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Ôîðìàò âðåìåíè:", -1, 7, 52, 134, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEFORMAT, 136, 50, 100, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "&Ðàçäåëèòåëü êîìïîíåíòîâ âðåìåíè:", -1, 7, 70, 144, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMESEPARATOR, 136, 68, 100, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Î&áîçí. âðåìåíè äî ïîëóäíÿ (AM):", -1, 7, 88, 144, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEAMSYMBOL, 136, 86, 100, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Îáî&çí. âðåìåíè ïîñëå ïîëóäíÿ (PM):", -1, 7, 106, 144, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEPMSYMBOL, 136, 104, 100, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "", -1, 7, 121, 228, 63, WS_VISIBLE LTEXT "Îáîçíà÷åíèå ôîðìàòà âðåìåíè\n\n\ h = ÷àñ m = ìèíóòà s = ñåêóíäà t = am èëè pm\n\n\ h = 12 ÷àñîâ H = 24 ÷àñà\n\ hh, mm, ss = ñ âûâîäîì íóëåé â íà÷àëå h, m, s = áåç âûâîäà íóëåé", - -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP + -1, 13, 130, 214, 49, WS_CHILD |WS_VISIBLE | WS_GROUP END Modified: trunk/reactos/dll/cpl/main/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/main/lang/ru-RU.rc Tue Jun 19 12:37:36 2007 @@ -5,24 +5,24 @@ CAPTION "Ñêîðîñòü" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Character repeat", -1, 5, 5, 230, 130 + GROUPBOX "Ïîâòîð ââîäèìîãî ñèìâîëà", -1, 5, 5, 230, 150 ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15 - LTEXT "Repeat &delay", -1, 40, 15, 50, 10 - LTEXT "Long", -1, 40, 30, 20, 10 - LTEXT "Short", -1, 200, 30, 20, 10 + LTEXT "&Çàäåðæêà ïåðåä íà÷àëîì ïîâòîðà:", -1, 40, 15, 160, 10 + LTEXT "Äëèííåå", -1, 25, 30, 28, 10 + LTEXT "Êîðî÷å", -1, 200, 30, 25, 10 CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17 ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15 - LTEXT "&Repeat rate", -1, 40, 70, 50, 10 - LTEXT "Slow", -1, 40, 85, 20, 10 - LTEXT "Fast", -1, 200, 85, 20, 10 + LTEXT "&Ñêîðîñòü ïîâòîðà:", -1, 40, 70, 100, 10 + LTEXT "Íèæå", -1, 40, 85, 20, 10 + LTEXT "Âûøå", -1, 200, 85, 20, 10 CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17 - LTEXT "Click here and hold down a key to &test repeat rate:", -1, 15, 105, 150, 10 - EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 115, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP - GROUPBOX "Cursor &blink rate:", -1, 5, 145, 230, 50 - LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 165, 1, 8 - LTEXT "None", -1, 40, 165, 30, 10 - LTEXT "Fast", -1, 200, 165, 30, 10 - CONTROL "",IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 165, 130, 17 + LTEXT "&×òîáû ïðîâåðèòü ñêîðîñòü ïîâòîðà, ïîìåñòèòå êóðñîð â ïîëå, íàæìèòå ëþáóþ êëàâèøó è íå îòïóñêàéòå åå:", -1, 15, 105, 200, 22 + EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 130, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "×àñòîòà ìåðöàíèÿ êóðñîðà", -1, 5, 165, 230, 50 + LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 185, 1, 8 + LTEXT "Íèæå", -1, 40, 185, 30, 10 + LTEXT "Âûøå", -1, 200, 185, 30, 10 + CONTROL "",IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 185, 130, 17 END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 @@ -34,107 +34,107 @@ IDD_CLICK_LOCK DIALOGEX 0, 0, 246, 100 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU -CAPTION "Click Lock" +CAPTION "Çàëèïàíèå êëàâèø" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Short", -1, 35, 50, 30, 10 - LTEXT "Long", -1, 140, 50, 30, 10 + LTEXT "Êîðî÷å", -1, 35, 50, 30, 10 + LTEXT "Äëèííåå", -1, 140, 50, 30, 10 CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 50, 70, 17 - PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 175, 75, 50, 15 + PUSHBUTTON "&OK", IDOK, 120, 75, 50, 15 + PUSHBUTTON "&Îòìåíà", IDCANCEL, 175, 75, 50, 15 LTEXT "&Adjust how long you need to hold down a mouse or trackball button before your click is locked",-1,60,15,170,30 ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Button" +CAPTION "Êíîïêè ìûøè" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Button configuration", -1, 5, 5, 230, 70 - CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 + GROUPBOX "Êîíôèãóðàöèÿ êíîïîê", -1, 5, 5, 230, 70 + CHECKBOX "&Îáìåíÿòü íàçíà÷åíèå êíîïîê", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE - LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 150, 30 - GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 - LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 150, 30 - LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 - LTEXT "Fast", -1, 140, 120, 30, 8 - CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + LTEXT "Íàçíà÷àåò ïðàâóþ êíîïêó äëÿ âûïîëíåíèÿ òàêèõ îñíîâíûõ ôóíêöèé, êàê âûáîð è ïåðåòàñêèâàíèå. ×àñòî èñïîëüçóåòñÿ òåìè, êòî ðàáîòàåò ìûøüþ ëåâîé ðóêîé.", -1, 10, 30, 150, 30 + GROUPBOX "Ñêîðîñòü âûïîëíåíèÿ äâîéíîãî ùåë÷êà", -1, 5, 75, 230, 70 + LTEXT "Ñäåëàéòå äâîéíîé ùåë÷îê ïî ýòîìó çíà÷êó. Åñëè ïàïêà íå îòêðûâàåòñÿ èëè íå çàêðûâàåòñÿ, âûáåðèòå áîëåå íèçêóþ ñêîðîñòü.", -1, 10, 85, 150, 30 + LTEXT "&Ñêîðîñòü: Íèæå", -1, 10, 120, 90, 8 + LTEXT "Âûøå", -1, 140, 120, 30, 8 + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 67, 121, 70, 17 CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE - GROUPBOX "ClickLock", -1, 5, 150, 230, 70 - CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 - PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 - LTEXT "Enables you to highlight or drag without holding down the mouse button. To set, briefly press the mouse button. To release, click the mouse button again", -1, 10, 180, 190, 30 + GROUPBOX "Çàëèïàíèå êíîïêè ìûøè", -1, 5, 150, 230, 70 + CHECKBOX "&Âêëþ÷èòü çàëèïàíèå", IDC_CHECK_CLICK_LOCK, 10, 160, 84, 20 + PUSHBUTTON "&Ïàðàìåòðû...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 14 + LTEXT "Ïîçâîëÿåò âûïîëíÿòü âûäåëåíèå è ïåðåòàñêèâàíèå áåç óäåðæèâàíèÿ êíîïêè íàæàòîé. Äëÿ âêëþ÷åíèÿ íåíàäîëãî çàäåðæèòå êíîïêó ìûøè â íàæàòîì ïîëîæåíèè. Äëÿ îñâîáîæäåíèÿ ñíîâà ñäåëàéòå ùåë÷îê.", -1, 10, 180, 190, 30 END IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Pointer" +CAPTION "Óêàçàòåëè" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Scheme", -1, 5, 5, 170, 45 - COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 - PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 + GROUPBOX "Ñõåìà", -1, 5, 5, 170, 45 + COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 160, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Ñîõðàíèòü &êàê...", IDC_BUTTON_SAVEAS_SCHEME, 65, 30, 60, 15 + PUSHBUTTON "&Óäàëèòü", IDC_BUTTON_DELETE_SCHEME, 130, 30, 40, 15 CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE - LTEXT "&Customize", -1, 5, 60, 40, 10 + LTEXT "&Íàñòðîéêà", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 - PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 - PUSHBUTTON "&Browse", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 + CHECKBOX "Âêëþ÷èòü &òåíü óêàçàòåëÿ", IDC_CHECK_DROP_SHADOW, 5, 203, 100, 10 + PUSHBUTTON "&Ïî óìîë÷àíèþ", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 55, 15 + PUSHBUTTON "&Îáçîð", IDC_BUTTON_BROWSE_CURSOR, 180, 200, 55, 15 END IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 75 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU -CAPTION "Save Scheme" +CAPTION "Ñîõðàíåíèå ñõåìû" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Save this cursor scheme as:", -1, 5, 5, 100, 10 + LTEXT "Íàçâàíèå ñîõðàíÿåìîé ñõåìû óêàçàòåëåé ìûøè:", -1, 5, 5, 100, 10 EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP - PUSHBUTTON "&Ok", IDOK, 60, 45, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 115, 45, 50, 15 + PUSHBUTTON "&OK", IDOK, 60, 45, 50, 15 + PUSHBUTTON "&Îòìåíà", IDCANCEL, 115, 45, 50, 15 END IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Pointer Options" +CAPTION "Ïàðàìåòðû óêàçàòåëÿ" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Motion", -1, 5, 5, 230, 60 - LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 - LTEXT "Slow", -1, 60, 30, 20, 10 + GROUPBOX "Ïåðåìåùåíèå", -1, 5, 5, 230, 60 + LTEXT "&Çàäàéòå ñêîðîñòü äâèæåíèå óêàçàòåëÿ:", -1, 60, 15, 150, 10 + LTEXT "Íèæå", -1, 60, 30, 20, 10 CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 - LTEXT "Fast", -1, 170, 30, 20, 10 + LTEXT "Âûøå", -1, 170, 30, 20, 10 ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 - CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 - GROUPBOX "Snap To", -1, 5, 65, 230, 40 - CHECKBOX "A&utomatically move pointer to the default button in a dialog box", - IDC_CHECK_SNAP_TO, 60, 75, 170, 20, BS_MULTILINE | BS_TOP + CHECKBOX "&Âêëþ÷èòü ïîâûøåííóþ òî÷íîñòü óñòàíîâêè óêàçàòåëÿ", IDC_CHECK_POINTER_PRECISION, 20, 50, 200, 10 + GROUPBOX "Èñõîäíîå ïîëîæåíèå â äèàëîãîâîì îêíå", -1, 5, 65, 230, 40 + CHECKBOX "&Íà êíîïêå, âûáèðàåìîé ïî óìîë÷àíèþ", + IDC_CHECK_SNAP_TO, 40, 82, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 - GROUPBOX "Visibility", -1, 5, 105, 230, 95 - CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 115, 80, 10 - LTEXT "Short", IDC_TEXT_TRAIL_SHORT, 60, 130, 30, 10 - LTEXT "Long", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 + GROUPBOX "Âèäèìîñòü", -1, 5, 105, 230, 95 + CHECKBOX "&Îòîáðàæàòü ñëåä óêàçàòåëÿ ìûøè", IDC_CHECK_POINTER_TRAIL, 40, 115, 135, 10 + LTEXT "Êîðî÷å", IDC_TEXT_TRAIL_SHORT, 54, 130, 30, 10 + LTEXT "Äëèííåå", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 - CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 - CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 82, 130, 70, 17 + CHECKBOX "&Ñêðûâàòü óêàçàòåëü âî âðåìÿ ââîäà ñ êëàâèàòóðû", IDC_CHECK_HIDE_POINTER, 40, 150, 185, 20 ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 - CHECKBOX "&Show location of pointer when I press the CTRL key", - IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP + CHECKBOX "Îáîçíà÷àòü ïîëî&æåíèå óêàçàòåëÿ ïðè íàæàòèè CTRL", + IDC_CHECK_SHOW_POINTER, 40, 175, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 END IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Wheel" +CAPTION "Êîëåñèêî" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Scrolling", -1, 5, 5, 230, 80 + GROUPBOX "Ïðîêðóòêà", -1, 5, 5, 230, 80 ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 - LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 - RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP - RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 + LTEXT "Ïîâîðîò êîëåñèêà íà îäèí ùåë÷îê ñëóæèò äëÿ ïðîêðóòêè:", -1, 20, 15, 200, 10 + RADIOBUTTON "íà óêàçàííîå êîëè÷åñòâî &ñòðîê:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + RADIOBUTTON "íà îäèí &ýêðàí", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END @@ -161,7 +161,7 @@ IDS_SIZEALL "Move" IDS_UPARROW "Alternative Select" IDS_HAND "Link Select" - IDS_NONE "(None)" + IDS_NONE "(íåò)" IDS_SYSTEM_SCHEME "(system scheme)" IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" IDS_BROWSE_TITLE "Browse" Modified: trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc Tue Jun 19 12:37:36 2007 @@ -56,21 +56,21 @@ IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Support" +CAPTION "Ïîääåæêà" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Connection Status", -1, 9, 8, 200, 88, BS_GROUPBOX - LTEXT "Address type:", -1, 22, 20, 80, 8 - LTEXT "IP address:", -1, 22, 34, 80, 8 - LTEXT "SubNet mask:", -1, 22, 48, 80, 8 - LTEXT "Default gateway:", -1, 22, 62, 80, 8 + GROUPBOX "Ñòàòóñ ïîäêëþ÷åíèÿ", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "Òèï àäðåñà:", -1, 22, 20, 80, 8 + LTEXT "IP àäðåñ:", -1, 22, 34, 80, 8 + LTEXT "Ìàñêà ïîäñåòè:", -1, 22, 48, 80, 8 + LTEXT "Øëþç ïî óìîë÷àíèþ:", -1, 22, 62, 80, 8 RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 - PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 + PUSHBUTTON "&Äîïîëíèòåëüíî...", IDC_DETAILS, 22, 76, 62, 14 END IDD_TCPIPPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 Modified: trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ru-R… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc Tue Jun 19 12:37:36 2007 @@ -7,7 +7,7 @@ CAPTION "Ñõåìû óïðàâëåíèÿ ïèòàíèåì" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_ACDC, IDI_ACDC, 7,7,28,22 + ICON IDI_ACDC, IDI_ACDC, 16,15,32,32 LTEXT "Âûáåðèòå ñõåìó óïðàâëåíèÿ ýëåêòðîïèòàíèåì ñ íàèáîëåå ïîäõîäÿùèìè ïàðàìåòðàìè äëÿ ýòîãî êîìïüþòåðà. Èçìåíåíèå íèæåñëåäóþùèõ ïàðàìåòðîâ èçìåíèò âûáðàííóþ ñõåìó.", -1,45,13,194,36 GROUPBOX "&Ñõåìû óïðàâëåíèÿ ïèòàíèåì", -1, 7,57,240,46 @@ -77,8 +77,8 @@ CAPTION "Äîïîëíèòåëüíî" FONT 8, "MS Sans Serif" BEGIN - ICON IDI_ACDC,IDI_ACDC,5,5,20,20 - LTEXT "Âûáåðèòå æåëàåìûå ïàðàìåòðû ýíåðãîñáåðåæåíèÿ.",-1,30,5,205,20 + ICON IDI_ACDC,IDI_ACDC,16,15,32,32 + LTEXT "Âûáåðèòå æåëàåìûå ïàðàìåòðû ýíåðãîñáåðåæåíèÿ.",-1,45,13,205,20 GROUPBOX "Ïàðàìåòðû",-1,5,35,225,55 CONTROL "&Âñåãäà îòîáðàæàòü çíà÷îê íà ïàíåëè çàäà÷",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,48,200,10 @@ -103,18 +103,18 @@ CAPTION "Ñïÿùèé ðåæèì" FONT 8, "MS Sans Serif" BEGIN - ICON IDI_SCREEN,IDI_SCREEN,5,5,20,20 + ICON IDI_SCREEN,IDI_SCREEN,16,15,32,32 LTEXT "Ïðè ïåðåõîäå â ñïÿùèé ðåæèì êîìïüþòåð ïåðåíîñèò ñîäåðæèìîå îïåðàòèâíîé ïàìÿòè íà äèñê è âûêëþ÷àåòñÿ. Ïðè âûõîäå èç ñïÿùåãî ðåæèìà êîìïüþòåð âîçâðàùàåòñÿ â ïðåæíåå ñîñòîÿíèå.", - -1,35,5,195,35 - GROUPBOX "Ñïÿùèé ðåæèì",-1,5,45,235,25 + -1,45,13,195,35 + GROUPBOX "Ñïÿùèé ðåæèì",-1,5,57,235,25 CONTROL "&Ðàçðåøèòü ïåðåõîä â ñïÿùèé ðåæèì",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,10,55,210,10 - GROUPBOX "Ìåñòî íà äèñêå äëÿ ïåðåõîäà â ñïÿùèé ðåæèì",-1,5,80,240,60 - LTEXT "Ñâîáîäíî ìåñòà íà äèñêå:",-1,10,90,100,10 - LTEXT "Íåò äàííûõ",IDC_FREESPACE,130,90,70,10 - LTEXT "Òðåáóåòñÿ äëÿ ñïÿùåãî ðåæèìà:",-1,10,100,115,10 - LTEXT "Íåò äàííûõ",IDC_SPACEFORHIBERNATEFILE,130,100,55,10 - LTEXT "Äëÿ âîçìîæíîñòè ïåðåõîäà â ñïÿùèé ðåæèì òðåáóåòñÿ îñâîáîäèòü ìåñòî íà äèñêå.",IDC_TOLESSFREESPACE,10,115,220,20 + WS_TABSTOP,10,67,210,10 + GROUPBOX "Ìåñòî íà äèñêå äëÿ ïåðåõîäà â ñïÿùèé ðåæèì",-1,5,92,240,60 + LTEXT "Ñâîáîäíî ìåñòà íà äèñêå:",-1,10,102,100,10 + LTEXT "Íåò äàííûõ",IDC_FREESPACE,130,102,70,10 + LTEXT "Òðåáóåòñÿ äëÿ ñïÿùåãî ðåæèìà:",-1,10,112,115,10 + LTEXT "Íåò äàííûõ",IDC_SPACEFORHIBERNATEFILE,130,112,55,10 + LTEXT "Äëÿ âîçìîæíîñòè ïåðåõîäà â ñïÿùèé ðåæèì òðåáóåòñÿ îñâîáîäèòü ìåñòî íà äèñêå.",IDC_TOLESSFREESPACE,10,127,220,20 END STRINGTABLE Modified: trunk/reactos/dll/cpl/powercfg/resources/acdc.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/dc.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/screen.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc Tue Jun 19 12:37:36 2007 @@ -6,18 +6,18 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Îïåðàöèîííàÿ ñèñòåìà:", IDC_STATIC, 4, 132, 32, 9 + LTEXT "Îïåðàöèîííàÿ ñèñòåìà:", IDC_STATIC, 4, 132, 80, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Âåðñèÿ ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT "Êîìïüþòåð:", IDC_STATIC, 124, 132, 34, 9 + LTEXT "Êîìïüþòåð:", IDC_STATIC, 124, 132, 40, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "Ïîñåòèòå <A HREF=""http://www.reactos.org/"">äîìàøíþþ ñòðàíèöó ÐåàêòÎÑ</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 93, 8 - PUSHBUTTON "View &licence...", IDC_LICENCE, 170, 199, 78, 13 + CONTROL "Ïîñåòèòå <A HREF=""http://www.reactos.org/"">äîìàøíþþ ñòðàíèöó ReactOS</A>.", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 204, 220, 8 + PUSHBUTTON "&Ëèöåíçèÿ...", IDC_LICENCE, 170, 200, 78, 13 END @@ -48,21 +48,21 @@ CAPTION "Äîïîëíèòåëüíî" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Administrator privileges are required for most of these settings.", IDC_STATIC, 12, 5, 236, 8 + LTEXT "Äëÿ èçìåíåíèÿ ýòèõ ïàðàìåòðîâ òðåáóþòñÿ ïðàâà Àäìèíèñòðàòîðà.", IDC_STATIC, 12, 5, 236, 8 GROUPBOX "Áûñòðîäåéñòâèå", IDC_STATIC, 6, 18, 244, 50 - LTEXT "Ïàðàìåòðû áåñòðîäåéñòâèÿ îïðåäåëÿþò, êàê ïðèëîæåíèÿ èñïîëüçóþò ïàìÿòü, ÷òî âëèÿåò íà ñêîðîñòü ðàáîòû êîìïüþòåðà.", IDC_STATIC, 16, 29, 210, 17 - PUSHBUTTON "&Ïàðàìåòðû áûñòðîäåéñòâèÿ...", IDC_PERFOR, 194, 48, 50, 15 + LTEXT "Âèçóàëüíûå ýôôåêòû, èñïîëüçîâàíèå ïðîöåññîðà, îïåðàòèâíîé è âèðòóàëüíîé ïàìÿòè.", IDC_STATIC, 16, 29, 210, 20 + PUSHBUTTON "&Ïàðàìåòðû", IDC_PERFOR, 194, 48, 50, 15 GROUPBOX "Ïðîôèëè ïîëüçîâàòåëåé", IDC_STATIC, 6,75,244,48 - LTEXT "Desktop settings related to your logon", IDC_STATIC, 16, 88, 210, 20 - PUSHBUTTON "Settings", IDC_USERPROFILE, 194, 103, 50, 15 + LTEXT "Ïàðàìåòðû ðàáî÷åãî ñòîëà, îòíîñÿùèåñÿ êî âõîäó â ñèñòåìó.", IDC_STATIC, 16, 88, 210, 20 + PUSHBUTTON "Ïàðàìåòðû", IDC_USERPROFILE, 194, 103, 50, 15 GROUPBOX "Çàãðóçêà è âîñòàíîâëåíèå", IDC_STATIC, 6, 131, 244, 52 - LTEXT "Ïàðàìåòðû çàãðóçêè è âîñòàíîâëåíèÿ îïðåäåëÿþò äåéñòâèÿ, âûïîëíÿåìûå ïðè çàïóñêå êîìïüþòåðà èëè ïðè îñòàíîâêå, âûçâàííîé êàêîé-íèáóäü îøèáêîé.", IDC_STATIC, 16, 144, 210, 19 - PUSHBUTTON "&Çàãðóçêà è âîñòàíîâëåíèå...", IDC_STAREC, 194, 162, 50, 15 - - PUSHBUTTON "Ï&åðåìåííûå ñðåäû...", IDC_ENVVAR, 84, 192, 80, 15 - PUSHBUTTON "Error Reporting", IDC_ERRORREPORT, 170, 192, 80, 15 + LTEXT "Çàãðóçêà è âîñòàíîëåíèå ñèñòåìû, îòëàäî÷íàÿ èíôîðìàöèÿ.", IDC_STATIC, 16, 144, 210, 20 + PUSHBUTTON "&Ïàðàìåòðû", IDC_STAREC, 194, 162, 50, 15 + + PUSHBUTTON "Ï&åðåìåííûå ñðåäû", IDC_ENVVAR, 84, 192, 80, 15 + PUSHBUTTON "Îò÷åò îá îøèáêàõ", IDC_ERRORREPORT, 170, 192, 80, 15 END @@ -72,23 +72,23 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_HARDPROF, IDC_STATIC, 8, 11, 18, 20, SS_ICON - LTEXT "You can set up hardware profiles for different hardware configurations. At startup, you can choose the profile you want to use.", IDC_STATIC, 46, 11, 188, 25 + LTEXT "Ìîæíî ñîçäàòü íåñêîëüêî ïðîôèëåé äëÿ ðàçëè÷íûõ êîíôèãóðàöèé îáîðóäîâàíèÿ è âûáðàòü íóæíûé ïðè çàãðóçêå ñèñòåìû.", IDC_STATIC, 46, 11, 188, 25 LTEXT "Äîñòóïíûå ïðîôèëè îáîðóäîâàíèÿ:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 15 PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 15 - PUSHBUTTON "Ñâîéñòâà", IDC_HRDPROFPROP, 8, 106, 50, 14 - PUSHBUTTON "Êîïèðîâàòü", IDC_HRDPROFCOPY, 63, 106, 50, 14 - PUSHBUTTON "Ïåðåèìåíîâàòü", IDC_HRDPROFRENAME, 118, 106, 50, 14 - PUSHBUTTON "Óäàëèòü", IDC_HRDPROFDEL, 173, 106, 50, 14 - - GROUPBOX "Hardware profiles selection", IDC_STATIC, 7, 130, 240, 75 - LTEXT "When ReactOS starts:", IDC_STATIC, 14, 142, 210, 8 + PUSHBUTTON "Ñâîéñòâà", IDC_HRDPROFPROP, 8, 106, 47, 14 + PUSHBUTTON "Êîïèðîâàòü", IDC_HRDPROFCOPY, 60, 106, 47, 14 + PUSHBUTTON "Ïåðåèìåíîâàòü", IDC_HRDPROFRENAME, 112, 106, 59, 14 + PUSHBUTTON "Óäàëèòü", IDC_HRDPROFDEL, 176, 106, 47, 14 + + GROUPBOX "Âûáîð ïðîôèëÿ îáîðóäîâàíèÿ", IDC_STATIC, 7, 130, 240, 75 + LTEXT "Ïðè çàãðóçêå ReactOS ñëåäóåò:", IDC_STATIC, 14, 142, 210, 8 //RADIOBUTTON "&Wait until I select a hardware profile", IDC_HRDPROFWAIT, 14, 158, 133, 8 //RADIOBUTTON "&Select the first profile listed if I don't select a profile in", IDC_HRDPROFSELECT, 14, 173, 190, 8 - CONTROL "&Wait until I select a hardware profile", IDC_HRDPROFWAIT, "button", BS_AUTORADIOBUTTON, 14, 158, 133, 8 - CONTROL "&Select the first profile listed if I don't select a profile in", IDC_HRDPROFSELECT, "button", BS_AUTORADIOBUTTON, 14, 173, 190, 8 - LTEXT "ñåêóíä", IDC_STATIC, 65, 187, 35, 8 + CONTROL "&Äîæäàòüñÿ ÿâíîãî óêàçàíèÿ îò ïîëüçîâàòåëÿ", IDC_HRDPROFWAIT, "button", BS_AUTORADIOBUTTON, 14, 158, 190, 8 + CONTROL "&Âûáðàòü ïåðâûé ïðîôèëü â ñïèñêå, åñëè âûáîð íå ñäåëàí çà", IDC_HRDPROFSELECT, "button", BS_AUTORADIOBUTTON, 14, 173, 215, 8 + LTEXT "ñåê.", IDC_STATIC, 65, 187, 35, 8 EDITTEXT IDC_HRDPROFEDIT, 25, 185, 35, 12 CONTROL "", IDC_HRDPROFUPDWN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 @@ -102,9 +102,9 @@ CAPTION "Ïåðåèìåíîâàòü ïðîôèëü" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "ÈÇ:", IDC_STATIC, 5, 10, 20, 8 LTEXT "", IDC_RENPROFEDITFROM, 30, 10, 160, 10 - LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + LTEXT "â:", IDC_STATIC, 5, 30, 20, 8 EDITTEXT IDC_RENPROFEDITTO, 30, 30, 160, 12 DEFPUSHBUTTON "OK", IDOK, 196, 6, 50, 14 @@ -127,7 +127,7 @@ PUSHBUTTON "Óäàëèòü", IDC_USERPROFILE_DELETE, 145, 156, 50, 13 PUSHBUTTON "Êîïèðîâàòü", IDC_USERPROFILE_COPY, 200, 156, 50, 13 - CONTROL "To create new user accounts, open <A>User Accounts</A> in Control Panel.", IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 175, 228, 8 + CONTROL "Ñîçäàéòå íîâûé ïðîôèëü, èñïîëüçóÿ <A>Ïðîôèëè ïîëüçîâàòåëåé</A> â Ïàíåëè óïðàâëåíèÿ.", IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 175, 230, 18 DEFPUSHBUTTON "OK", IDOK, 134, 200, 54, 13 PUSHBUTTON "Îòìåíà", IDCANCEL, 196, 200, 54, 13 @@ -139,31 +139,31 @@ CAPTION "Çàãðóçêà è âîñòàíîâëåíèå" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Çàãðóçêà ñèñòåìû", IDC_STATIC, 7, 12, 238, 95 - LTEXT "Îïåðàöèîííàÿ ñèñòåìà ïî óìîë÷àíèþ:", IDC_STATIC, 14, 26, 100, 8 + GROUPBOX "Çàãðóçêà îïåðàöèîííîé ñèñòåìû", IDC_STATIC, 7, 12, 238, 95 + LTEXT "Îïåðàöèîííàÿ ñèñòåìà ïî óìîë÷àíèþ:", IDC_STATIC, 14, 26, 145, 8 COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST - //CHECKBOX "&Time to display list of operating systems:", IDC_STRECLIST, 14, 56, 150, 8 - CONTROL "&Time to display list of operating systems:", IDC_STRECLIST, "button", BS_AUTOCHECKBOX, 14, 56, 150, 8 + //CHECKBOX "Î&òîáðàæàòü ñïèñîê îïåðàöèîííûõ ñèñòåì:", IDC_STRECLIST, 14, 56, 150, 8 + CONTROL "Î&òîáðàæàòü ñïèñîê îïåðàöèîííûõ ñèñòåì:", IDC_STRECLIST, "button", BS_AUTOCHECKBOX, 14, 56, 155, 8 EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12 CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "ñåêóíä", IDC_STATIC, 215, 56, 25, 8 - CONTROL "Time to &display recovery options when needed:", IDC_STRRECREC, "button", BS_AUTOCHECKBOX, 14, 70, 163, 8 + CONTROL "Îòîáðàæàòü &âàðèàíòû âîñòàíîâëåíèÿ:", IDC_STRRECREC, "button", BS_AUTOCHECKBOX, 14, 70, 163, 8 EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12 CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "ñåêóíä", IDC_STATIC, 215, 70, 25, 8 - LTEXT "To edit the startup options file manually, click Edit.", IDC_STATIC, 14, 89, 187, 8 - PUSHBUTTON "&Edit", IDC_STRRECEDIT, 188, 87, 50, 14 - - GROUPBOX "System failure", IDC_STATIC, 7, 111, 238, 140 - CONTROL "&Write an event to the system log", IDC_STRRECWRITEEVENT, "button", BS_AUTOCHECKBOX, 14, 124, 148, 10 - CONTROL "Se&nd an administrative alert", IDC_STRRECSENDALERT, "button", BS_AUTOCHECKBOX, 14, 138, 148, 10 - CONTROL "Automatically &restart", IDC_STRRECRESTART, "button", BS_AUTOCHECKBOX, 14, 152, 145, 10 - - GROUPBOX "Write debugging information", IDC_STATIC, 12, 167, 227, 76 + LTEXT "Äëÿ ðåäàêòèðîâàíèÿ âðó÷íóþ íàæìèòå ""Èçìåíèòü""", IDC_STATIC, 14, 90, 187, 8 + PUSHBUTTON "&Èçìåíèòü", IDC_STRRECEDIT, 188, 87, 50, 14 + + GROUPBOX "Îòêàç ñèñòåìû", IDC_STATIC, 7, 111, 238, 140 + CONTROL "Çàïèñàòü ñîáûòèå â ñèñòåìíûé &æóðíàë", IDC_STRRECWRITEEVENT, "button", BS_AUTOCHECKBOX, 14, 124, 154, 10 + CONTROL "&Îòïðàâèòü àäìèíèñòðàòèâíîå îïîâåùåíèå", IDC_STRRECSENDALERT, "button", BS_AUTOCHECKBOX, 14, 138, 158, 10 + CONTROL "Âûïîëíèòü &àâòîìàòè÷åñêóþ ïåðåçàãðóçêó", IDC_STRRECRESTART, "button", BS_AUTOCHECKBOX, 14, 152, 154, 10 + + GROUPBOX "Çàïèñü îòëàäî÷íîé èíôîðìàöèè", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST - LTEXT "Dump &file:", IDC_STATIC, 17, 202, 150, 8 + LTEXT "Ôàéë äàìïà ïàìÿòè:", IDC_STATIC, 17, 202, 150, 8 EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 - CONTROL "&Overwrite any existing file", IDC_STRRECOVERWRITE, "button", BS_AUTOCHECKBOX, 17, 228, 125, 10 + CONTROL "Çàìåíÿòü &ñóùåñòâóþùèé ôàéë äàìïà", IDC_STRRECOVERWRITE, "button", BS_AUTOCHECKBOX, 17, 228, 137, 10 DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 PUSHBUTTON "Îòìåíà", IDCANCEL, 195, 259, 50, 14 @@ -183,23 +183,23 @@ GROUPBOX "Ðàçìåð ôàéëà ïîäêà÷êè äëÿ âûáðàííîãî äèñêà", IDC_DRIVEGROUP, 10, 70, 204, 104 LTEXT "Äèñê:", IDC_STATIC, 20, 80, 20, 8 LTEXT "", IDC_DRIVE, 88, 81, 100, 9 - LTEXT "Äîñòóïíîå ïðîñòðàíñòâî:", IDC_STATIC, 20, 92, 56, 9 - LTEXT "", IDC_SPACEAVAIL, 88, 92, 104, 9 - LTEXT "Èñõîäíûé ðàçìåð (MB):", -1, 22, 118, 54, 9 - LTEXT "Ìàêñèìàëüíûé ðàçìåð (MB):", -1, 22, 131, 64, 9 - CONTROL "&Custom size", IDC_CUSTOM, "Button", BS_AUTORADIOBUTTON, 20, 105, 54, 9 - CONTROL "Ðàçìåð ïî âûáîðó ñèñòåìû", IDC_SYSMANSIZE, "Button", BS_AUTORADIOBUTTON, 20, 145, 88, 9 - CONTROL "Áåç ôàéëà ïîäêà÷êè", IDC_NOPAGEFILE, "Button", BS_AUTORADIOBUTTON, 20, 158, 78,9 - EDITTEXT IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE - EDITTEXT IDC_MAXSIZE, 100, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE + LTEXT "Äîñòóïíîå ïðîñòðàíñòâî:", IDC_STATIC, 20, 92, 160, 9 + LTEXT "", IDC_SPACEAVAIL, 104, 92, 104, 9 + LTEXT "Èñõîäíûé ðàçìåð (MB):", -1, 22, 118, 80, 9 + LTEXT "Ìàêñèìàëüíûé ðàçìåð (MB):", -1, 22, 131, 105, 9 + CONTROL "&Äðóãîé ðàçìåð", IDC_CUSTOM, "Button", BS_AUTORADIOBUTTON, 20, 105, 60, 9 + CONTROL "Ðàçìåð ïî âûáîðó ñèñòåìû", IDC_SYSMANSIZE, "Button", BS_AUTORADIOBUTTON, 20, 145, 100, 9 + CONTROL "Áåç ôàéëà ïîäêà÷êè", IDC_NOPAGEFILE, "Button", BS_AUTORADIOBUTTON, 20, 158, 85, 9 + EDITTEXT IDC_INITIALSIZE, 120, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE + EDITTEXT IDC_MAXSIZE, 120, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE PUSHBUTTON "Óñòàíîâèòü", IDC_SET, 158, 155, 50, 13 GROUPBOX "Îáùèé îáúåì ôàéëà ïîäêà÷êè íà âñåõ äèñêàõ", IDC_TOTALGROUP, 10, 177, 204, 46 - LTEXT "Minimum allowed:", IDC_STATIC, 18, 188, 58, 9 + LTEXT "Ìèíèìàëüíûé ðàçìåð:", IDC_STATIC, 18, 188, 58, 9 LTEXT "", IDC_MINIMUM, 88, 188, 100, 9 - LTEXT "Recommended:", IDC_STATIC, 18, 199, 52, 9 + LTEXT "Ðåêîìåíäóåìûé:", IDC_STATIC, 18, 199, 52, 9 LTEXT "", IDC_RECOMMENDED, 88, 197, 100, 9 - LTEXT "Currently allocated:", IDC_STATIC, 18, 210, 66, 9 + LTEXT "Òåêóùèé ðàçìåð:", IDC_STATIC, 18, 210, 66, 9 LTEXT "", IDC_CURRENT, 88, 208, 100, 9 DEFPUSHBUTTON "OK", IDOK, 114, 232, 48, 13 Added: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc (added) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc Tue Jun 19 12:37:36 2007 @@ -1,0 +1,58 @@ +//Russian language file. (Dmitry Chapyshev, 2007.06.17) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Ïîæàëóéñòà ïîäîæäèòå..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + +IDD_NOTICE_DLG DIALOGEX 0,0,186,59 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Äîáðî ïîæàëîâàòü â ReactOS" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "Íàæèòå êëàâèøè Control-Alt-Delete",IDC_STATIC,16,18,144,14 +END + +IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Âõîä" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Îòìåíà",IDCANCEL,115,122,50,14 + PUSHBUTTON "Âûêëþ÷åíèå",IDC_SHUTDOWN,179,122,50,14 + LTEXT "Èìÿ ïîëüçîâàòåëÿ:",IDC_STATIC,36,75,40,8 + LTEXT "Ïàðîëü:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD + CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,261,51 +END + +IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +CAPTION "Áåçîïàñíîñòü" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + PUSHBUTTON "Îòìåíà",IDCANCEL,170,95,70,14 + PUSHBUTTON "Çàâåðøåíèå ñåàíñà",IDC_LOGOFF,90,76,70,14 + PUSHBUTTON "Âûêëþ÷åíèå",IDC_SHUTDOWN,170,76,70,14 + LTEXT "×òî íóæíî ñäåëàòü?",IDC_STATIC,86,53,87,8 + PUSHBUTTON "Çàáëîêèðîâàòü êîìïüþòåð",IDC_LOCK,10,76,70,14 + PUSHBUTTON "Äèñïåò÷åð çàäà÷",IDC_TASKMGR,90,95,70,14 + CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,230,38 +END + +STRINGTABLE +BEGIN + IDS_LOGGEDOUTSAS "Äîáðî ïîæàëîâàòü!" + IDS_LOCKEDSAS "Ýòîò êîìïüþòåð ñåé÷àñ çàáëîêèðîâàí." + IDS_PRESSCTRLALTDELETE "Íàæìèòå êëàâèøè Control+Alt+Delete äëÿ âõîäà." + IDS_ASKFORUSER "Èìÿ ïîëüçîâàòåëÿ: " + IDS_ASKFORPASSWORD "Ïàðîëü: " + IDS_FORCELOGOFF "Ïðè ðåãèñòðàöèè íîâîãî ïîëüçîâàòåëÿ âñå íåñîõðàíåííûå äàííûå áóäóò óòåðÿíû. Ïðîäîëæèòü?" +END Propchange: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rc (original) +++ trunk/reactos/dll/win32/msgina/msgina.rc Tue Jun 19 12:37:36 2007 @@ -13,5 +13,5 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" - Added: trunk/reactos/dll/win32/netid/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/ru-RU… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/ru-RU.rc (added) +++ trunk/reactos/dll/win32/netid/lang/ru-RU.rc Tue Jun 19 12:37:36 2007 @@ -1,0 +1,22 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Èìÿ êîìïüþòåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON + LTEXT "ReactOS èñïîëüçóåò óêàçàííûå íèæå ñâåäåíèÿ äëÿ èäåíòèôèêàöèè êîìïüþòåðà â ñåòè.", IDC_STATIC, 40, 5, 204, 20 + LTEXT "Îïèñàíèå:", IDC_STATIC, 6, 40, 70, 9 + EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Ïîëíîå èìÿ:", IDC_STATIC, 6, 68, 64, 9 + LTEXT "(Ïî óìîë÷àíèþ)", IDC_COMPUTERNAME, 98, 68, 144, 11 + LTEXT "Ðàáî÷àÿ ãðóïïà:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "(ïóñòî)", IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 9 + LTEXT "×òîáû âûçâàòü ìàñòåð ñåòåâîé èäåíòèôèêàöèè äëÿ ïðèñîåäèíåíèÿ êîìïüþòåðà ê äîìåíó, íàæìèòå êíîïêó ""Èäåíòèôèêàöèÿ"".", IDC_STATIC, 6, 108, 172, 24 + PUSHBUTTON "&Èäåíòèôèêàöèÿ...", IDC_NETWORK_ID, 185, 114, 67, 15 + LTEXT "×òîáû èçìåíèòü èìÿ êîìïüþòåðà èëè äîìåíà íàæìèòå ""Èçìåíèòü"".", IDC_STATIC, 6, 149, 170, 17 + PUSHBUTTON "È&çìåíèòü...",IDC_NETWORK_PROPERTY, 185, 149, 67, 15 + LTEXT "Ïðèìå÷àíèå: Òîëüêî àäìèíèñòðàòîðû ìîãóò èçìåíÿòü ýòè ïàðàìåòðû.", IDC_STATIC, 6, 179, 300, 9 +END + Propchange: trunk/reactos/dll/win32/netid/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/netid/netid.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.rc?r… ============================================================================== --- trunk/reactos/dll/win32/netid/netid.rc (original) +++ trunk/reactos/dll/win32/netid/netid.rc Tue Jun 19 12:37:36 2007 @@ -16,3 +16,4 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" Added: trunk/reactos/dll/win32/serialui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/serialui/lang/ru-RU.rc (added) +++ trunk/reactos/dll/win32/serialui/lang/ru-RU.rc Tue Jun 19 12:37:36 2007 @@ -1,0 +1,41 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE LOADONCALL DISCARDABLE +BEGIN + IDS_EVENPARITY, "Even" + IDS_MARKPARITY, "Mark" + IDS_NOPARITY, "No parity" + IDS_ODDPARITY, "Odd" + IDS_SPACEPARITY, "Space" + + IDS_ONESTOPBIT, "1 stop bit" + IDS_ONE5STOPBITS, "1.5 stop bits" + IDS_TWOSTOPBITS, "2 stop bits" + + IDS_FC_NO, "Íåò" + IDS_FC_CTSRTS, "CTS/RTS" + IDS_FC_XONXOFF, "XON/XOFF" + + IDS_TITLE, "Ñâîéñòâà äëÿ %s" +END + +IDD_COMMDLG DIALOGEX 6,5,222,175 +FONT 8, "MS Shell Dlg" +STYLE 0x10C80080 +EXSTYLE 0x00000001 +BEGIN + CONTROL "",IDC_GRP1,"Button",0x50000007,6,5,210,146,0x00000000 + CONTROL "OK",IDC_OKBTN,"Button",0x50010000,98,156,56,13,0x00000000 + CONTROL "Îòìåíà",IDC_CANCELBTN,"Button",0x50010000,158,156,56,13,0x00000000 + CONTROL "Baud rate:",IDC_STC1,"Static",0x50000000,24,31,42,9,0x00000000 + CONTROL "Byte size:",IDC_STC2,"Static",0x50000000,24,53,42,9,0x00000000 + CONTROL "Parity:",IDC_STC3,"Static",0x50000000,24,73,42,9,0x00000000 + CONTROL "Stop bits:",IDC_STC4,"Static",0x50000000,24,96,42,9,0x00000000 + CONTROL "Flow control:",IDC_STC5,"Static",0x50000000,24,120,42,9,0x00000000 + CONTROL "",IDC_BAUDRATE,"ComboBox",0x50210003,98,29,100,50,0x00000000 + CONTROL "",IDC_BYTESIZE,"ComboBox",0x50210003,98,49,100,50,0x00000000 + CONTROL "",IDC_PARITY,"ComboBox",0x50210003,98,72,100,50,0x00000000 + CONTROL "",IDC_STOPBITS,"ComboBox",0x50210003,98,94,100,50,0x00000000 + CONTROL "",IDC_FLOW,"ComboBox",0x50210003,98,116,100,50,0x00000000 +END + Propchange: trunk/reactos/dll/win32/serialui/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/serialu… ============================================================================== --- trunk/reactos/dll/win32/serialui/serialui.rc (original) +++ trunk/reactos/dll/win32/serialui/serialui.rc Tue Jun 19 12:37:36 2007 @@ -13,5 +13,4 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/pl-PL.rc" - - +#include "lang/ru-RU.rc" Added: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc (added) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc Tue Jun 19 12:37:36 2007 @@ -1,0 +1,231 @@ +// Russian language resource file (Dmitry Chapyshev, 2007-06-13) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + + +IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Äîáðî ïîæàëîâàòü â ìàñòåð óñòàíîâêè ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "Ýòîò ìàñòåð óñòàíîâèò ReactOS íà âàø êîìïüþòåð. Ìàñòåð "\ + "ïîìîæåò ââåñòè ñâåäåíèÿ äëÿ ïðàâèëüíîé óñòàíîâêè ReactOS.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Íàæìèòå ""Äàëåå"" äëÿ ïðîäîëæåíèÿ óñòàíîâêè.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ðàçðàáîò÷èêè ReactOS è Open Source-ïðîåêòû, áëàãîäàðÿ êîòîðûì "\ + "áûëà ñîçäàíà ReactOS:", + IDC_STATIC,15,7,286,19 + LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | + LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LTEXT "ReactOS ðàñïðîñòðàíÿåòñÿ ïîä ëèöåíçèåé GPL, åñëè "\ + "âû õîòèòå èñïîëüçîâàòü è ðàñïðîñòðàíÿòü åå, âû äîëæíû ñîáëþäàòü GPL.", + IDC_STATIC,15,110,227,19 + PUSHBUTTON "&Ëèöåíçèÿ...",IDC_VIEWGPL,251,110,50,14 + LTEXT "Íàæìèòå ""Äàëåå"" äëÿ ïðîäîëæåíèÿ óñòàíîâêè.",IDC_STATIC,15,136, + 195,17 +END + + +IDD_OWNERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ââåäèòå âàøå ïîëíîå èìÿ è íàçâàíèå îðãàíèçàöèè.", + IDC_STATIC, 54, 7, 242, 21 + LTEXT "&Èìÿ:", IDC_STATIC, 54, 37, 44, 8 + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Îðãàíèçàöèÿ:", IDC_STATIC, 54, 57, 47, 8 + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL +END + + +IDD_COMPUTERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ââåäèòå èìÿ âàøåãî êîìïüþòåðà (íå áîëåå 63 ñèìâîëîâ). "\ + "Åñëè âàø êîìïüþòåð ïîäêëþ÷åí ê ñåòè, òî åãî èìÿ äîëæíî áûòü óíèêàëüíî.", + IDC_STATIC, 54, 7, 250, 24 + LTEXT "&Èìÿ êîìïüþòåðà:", IDC_STATIC, 54, 38, 75, 8 + EDITTEXT IDC_COMPUTERNAME, 140, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + LTEXT "Ïðè óñòàíîâêå áóäåò ñîçäàí ïðîôèëü ïîëüçîâàòåëÿ ñ èìåíåì Administrator "\ + "Âû ìîæåòå èñïîëüçîâàòü ýòîò ïðîôèëü, åñëè âàì íóæíî ïîëó÷èòü ïðàâà àäìèíèñòðàòîðà.", + IDC_STATIC, 54, 57, 250, 25 + LTEXT "Ââåäèòå ïàðîëü àäìèíèñòðàòîðà (íå áîëåå 14 ñèìâîëîâ).", + IDC_STATIC, 54, 87, 250, 8 + LTEXT "&Ïàðîëü àäìèíèñòðàòîðà:", IDC_STATIC, 54, 104, 110, 8 + EDITTEXT IDC_ADMINPASSWORD1, 140, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "Ï&îâòîðèòå ïàðîëü:", IDC_STATIC, 54, 123, 75, 8 + EDITTEXT IDC_ADMINPASSWORD2, 140, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD +END + + +IDD_LOCALEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ßçûê ñèñòåìû óñòàíàâëèâàåòñÿ è äåéñòâóåò âî âñåõ ïðèëîæåíèÿõ. "\ + "Ìîæíî âûáðàòü ñèñòåìó èñ÷èñëåíèÿ, ôîðìàò ÷èñåë è äàòû.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "Äëÿ èçìåíåíèÿ ÿçûêà ñèñòåìû íàæìèòå ""Íàñòðîèòü"".", + IDC_STATIC, 53, 60, 184, 8 + PUSHBUTTON "&Íàñòðîèòü...", IDC_CUSTOMLOCALE, 245, 57, 55, 14 + LTEXT "Âûáðàâ ðàñêëàäêó âû ñìîæåòå ââîäèòü ñèìâîëû íà âàøåì ÿçûêå.", + IDC_STATIC, 53, 86, 253, 8 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "Äëÿ èçìåíåíèÿ ðàñêëàäêè íàæìèòå ""Íàñòðîèòü"".", + IDC_STATIC, 53, 126, 184, 8 + PUSHBUTTON "Í&àñòðîèòü...", IDC_CUSTOMLAYOUT, 245, 122, 55, 14 +END + + +IDD_DATETIMEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Äàòà è âðåìÿ", IDC_STATIC, 53, 7, 253, 8 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "×àñîâîé ïîÿñ", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, + CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + AUTOCHECKBOX "Àâ&òîìàòè÷åñêèé ïåðåõîä íà ëåòíåå âðåìÿ è îáðàòíî.", + IDC_AUTODAYLIGHT, 53, 124, 201, 10 +END + + +IDD_PROCESSPAGE DIALOG 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 +END + + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Çàâåðøåíèå óñòàíîâêè ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Çàâåðøåíèå ìàñòåðà óñòàíîâêè ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "Âû óñïåøíî çàêîí÷èëè óñòàíîâêó ReactOS.\n\n" \ + "Íàæìèòå Çàâåðøèòü äëÿ ïåðåçàãðóçêè âàøåãî êîìïüþòåðà.", IDC_STATIC, 115, 40, 195, 100 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 + LTEXT "Åñëè â CD íàõîäèòñÿ â ïðèâîäå, íóæíî èçâëå÷ü åãî. Äëÿ ïåðåçàãðóçêè "\ + "êîìïüþòåðà íàæìèòå ""Ãîòîâî"".", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_GPL DIALOG 0, 0, 333, 230 +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "GNU General Public License" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | + ES_READONLY | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,141,209,50,14 +END + + +STRINGTABLE +BEGIN + IDS_ACKTITLE "Ïîäòâåðæäåíèÿ" + IDS_ACKSUBTITLE "Èíôîðìàöèÿ î ðàçðàáîò÷èêàõ ReactOS è ëèçåíçèîííîå ñîãëàøåíèå." + IDS_OWNERTITLE "Ïåðñîíàëüíûå äàííûå" + IDS_OWNERSUBTITLE "Óñòàíîâêà èíôîðìàöèè î ïîëüçîâàòåëÿõ ReactOS." + IDS_COMPUTERTITLE "Èìÿ êîìïüþòåðà è ïàðîëü àäìèíèñòðàòîðà" + IDS_COMPUTERSUBTITLE "Âû äîëæíû ââåñòè èìÿ è àäìèíèñòðàòîðñêèé ïàðîëü äëÿ âàøåãî êîìïüþòåðà." + IDS_LOCALETITLE "Ðåãèîíàëüíûå íàñòðîéêè" + IDS_LOCALESUBTITLE "Âû ìîæåòå íàñòðàèâàòü ReactOS äëÿ ðàçíûõ ðåãèîíîâ è ÿçûêîâ." + IDS_DATETIMETITLE "Äàòà è âðåìÿ" + IDS_DATETIMESUBTITLE "Óñòàíîâèòå ïðàâèëüíóþ äàòó è âðåìÿ íà âàøåì êîìïüþòåðå." + IDS_PROCESSTITLE "Ïðîöåññ óñòàíîâêè" + IDS_PROCESSSUBTITLE "Óñòàíîâêà ReactOS íà âàø êîìïüþòåð." +END + +STRINGTABLE +BEGIN + IDS_CMT_WINEFILE "Çàïóñòèòü Winefile" + IDS_CMT_IBROWSER "Çàïóñòèòü iBrowser" + IDS_CMT_GETFIREFOX "Ñêà÷àòü/óñòàíîâèòü Firefox" + IDS_CMT_DOWNLOADER "Ñêà÷àòü è óñòàíîâèòü äðóãèå ïðèëîæåíèÿ" +END + +STRINGTABLE +BEGIN + IDS_ACCESSORIES "Ñòàíäàðòíûå" + IDS_CMT_CALC "Çàïóñòèòü êàëüêóëÿòîð" + IDS_CMT_CMD "Îòêðûòü êîìàíäíóþ ñòðîêó" + IDS_CMT_EXPLORER "Çàïóñòèòü Ïðîâîäíèê" + IDS_CMT_NOTEPAD "Çàïóñòèòü òåêñòîâûé ðåäàêòîð" + IDS_CMT_REGEDIT "Çàïóñòèòü ðåäàêòîð ðååñòðà" + IDS_CMT_WORDPAD "Çàïóñòèòü ðåäàêòîð äîêóìåíòîâ" + IDS_CMT_SCREENSHOT "Ñäåëàòü ñíèìîê ýêðàíà" +END + +STRINGTABLE +BEGIN + IDS_GAMES "Èãðû" + IDS_CMT_SOLITAIRE "Solitaire" + IDS_CMT_WINEMINE "WineMine" +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "Óñòàíîâêà ReactOS" + IDS_UNKNOWN_ERROR "Íåèçâåñòíàÿ îøèáêà" + IDS_REGISTERING_COMPONENTS "Ðåãèñòðàöèÿ êîìïîíåíòîâ..." + IDS_LOADLIBRARY_FAILED "Îøèáêà LoadLibrary: " + IDS_GETPROCADDR_FAILED "Îøèáêà GetProcAddr: " + IDS_REGSVR_FAILED "Îøèáêà DllRegisterServer: " + IDS_DLLINSTALL_FAILED "Îøèáêà DllInstall: " + IDS_TIMEOUT "Òàéìàóò â õîäå ðåãèñòðàöèè" + IDS_REASON_UNKNOWN "" +END + +STRINGTABLE +BEGIN + IDS_SHORT_CMD "Command Prompt.lnk" + IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" + IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_FIREFOX "Get Firefox.lnk" + IDS_SHORT_SERVICE "Service Manager.lnk" + IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_CALC "Calculator.lnk" + IDS_SHORT_REGEDIT "Regedit.lnk" + IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_SNAP "SnapShot.lnk" + IDS_SHORT_SOLITAIRE "Solitaire.lnk" + IDS_SHORT_WINEMINE "WineMine.lnk" +END + +STRINGTABLE +BEGIN + IDS_WZD_NAME "Äëÿ ïðîäîëæåíèÿ óñòàíîâêè íóæíî ââåñòè âàøå èìÿ." + IDS_WZD_SETCOMPUTERNAME "Îøèáêà óñòàíîâêè! Íóæíî ââåñòè èìÿ êîìïüþòåðà." + IDS_WZD_COMPUTERNAME "Äëÿ ïðîäîëæåíèÿ óñòàíîâêè íóæíî ââåñòè èìÿ êîìïüþòåðà." + IDS_WZD_PASSWORDEMPTY "Âû äîëæíû ââåñòè ïàðîëü!" + IDS_WZD_PASSWORDMATCH "Ïàðîëè, êîòîðûå âû ââåëè íå ñîâïàäàþò. Ââåäèòå èõ ñíîâà." + IDS_WZD_PASSWORDCHAR "Ïàðîëè, êîòîðûå âû ââåëè ñîäåðæàò çàïðåùåííûå ñèìâîëû. Ââåäèòå èõ ñíîâà." + IDS_WZD_LOCALTIME "Íå óäàëîñü óñòàíîâèòü ìåñòíîå âðåìÿ." +END +/* EOF */ Propchange: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rc (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rc Tue Jun 19 12:37:36 2007 @@ -55,3 +55,4 @@ #include "lang/pl-PL.rc" #include "lang/uk-UA.rc" #include "lang/zh-CN.rc" +#include "lang/ru-RU.rc" Added: trunk/reactos/dll/win32/user32/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/Ru.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/user32/Ru.rc (added) +++ trunk/reactos/dll/win32/user32/Ru.rc Tue Jun 19 12:37:36 2007 @@ -1,0 +1,75 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +///////////////////////////////////////////////////////////////////////////// +// +// Dialogs +// + +SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 +STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Âûáîð îêíà" +BEGIN + LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL + PUSHBUTTON "&OK", 1, 60, 120, 40, 15, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Îòìåíà", 2, 120, 120, 40, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +///////////////////////////////////////////////////////////////////////////// +// +// Menus +// + +EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + POPUP "DUMMY" + BEGIN + MENUITEM "&Îòìåíèòü", EM_UNDO + MENUITEM SEPARATOR + MENUITEM "&Âûðåçàòü", WM_CUT + MENUITEM "&Êîïèðîâàòü", WM_COPY + MENUITEM "Â&ñòàâèòü", WM_PASTE + MENUITEM "&Óäàëèòü", WM_CLEAR + MENUITEM SEPARATOR + MENUITEM "Âûäåëèòü &âñå", EM_SETSEL + END +} + + +SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + MENUITEM "&Âîñòàíîâèòü", 61728 + MENUITEM "&Ïåðåìåñòèòü", 61456 + MENUITEM "Ð&àçìåð", 61440 + MENUITEM "&Ñâåðíóòü", 61472 + MENUITEM "&Ðàçâåðíóòü", 61488 + MENUITEM SEPARATOR + MENUITEM "&Çàêðûòü\tAlt-F4", 61536 +} + +///////////////////////////////////////////////////////////////////////////// +// +// Strings +// + +STRINGTABLE +{ + IDS_ERROR, "Îøèáêà" + IDS_OK, "OK" + IDS_CANCEL, "Îòìåíà" + IDS_ABORT, "&Ïðåêðàòèòü" + IDS_RETRY, "Ï&îâòîðèòü" + IDS_IGNORE, "&Èãíîðèðîâàòü" + IDS_YES, "&Äà" + IDS_NO, "&Íåò" + IDS_HELP, "Ñïðàâêà" + IDS_TRYAGAIN, "&Ïîâòîðèòü ïîçäíåå" + IDS_CONTINUE, "Ï&ðîäîëæèòü" +} + +STRINGTABLE +{ + IDS_MDI_MOREWINDOWS, "&Äðóãèå îêíà..." +} + Modified: trunk/reactos/dll/win32/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rc… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rc (original) +++ trunk/reactos/dll/win32/user32/user32.rc Tue Jun 19 12:37:36 2007 @@ -96,3 +96,4 @@ #include "Pl.rc" #include "Sv.rc" #include "Uk.rc" +#include "Ru.rc"

17 years, 6 months

[fireball] 27234: - Russian language translation fixes by Dmitry Chapyshev.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Jun 19 12:27:45 2007 New Revision: 27234 URL: http://svn.reactos.org/svn/reactos?rev=27234&view=rev Log: - Russian language translation fixes by Dmitry Chapyshev. Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/base/applications/notepad/lang/ru-RU.rc trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc trunk/reactos/base/setup/vmwinst/lang/ru-RU.rc trunk/reactos/base/system/rundll32/lang/ru-RU.rc Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc Tue Jun 19 12:27:45 2007 @@ -53,8 +53,8 @@ SCIMS_MENU MENU DISCARDABLE { POPUP "&Ïðàâêà" { - MENUITEM "&Êîïèðîâàòü Ctrl+C", IDM_COPY - MENUITEM "Âñò&àâèòü Ctrl+V", IDM_PASTE + MENUITEM "&Êîïèðîâàòü \tCtrl+C", IDM_COPY + MENUITEM "Âñò&àâèòü \tCtrl+V", IDM_PASTE } POPUP "&Âèä" { MENUITEM "&Ïðîñòîé", IDM_MODE_STANDARD @@ -81,8 +81,8 @@ SCIWS_MENU MENU DISCARDABLE { POPUP "&Ïðàâêà" { - MENUITEM "&Êîïèðîâàòü Ctrl+C", IDM_COPY - MENUITEM "Âñò&àâèòü Ctrl+V", IDM_PASTE + MENUITEM "&Êîïèðîâàòü \tCtrl+C", IDM_COPY + MENUITEM "Âñò&àâèòü \tCtrl+V", IDM_PASTE } POPUP "&Âèä" { MENUITEM "&Ïðîñòîé", IDM_MODE_STANDARD Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc Tue Jun 19 12:27:45 2007 @@ -41,11 +41,11 @@ END IDD_ABOUTBOX DIALOGEX 22,16,190,182 -CAPTION "Î Device Manager" +CAPTION "Î Äèñïåò÷åðå óñòðîéñòâ" FONT 8,"Tahoma",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Device Manager v0.1\nCopyright (C) 2006\nîò Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Äèñïåò÷åð óñòðîéñòâ v0.1\nCopyright (C) 2006\nîò Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Çàêðûòü", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -67,7 +67,7 @@ /* Hints */ STRINGTABLE DISCARDABLE BEGIN - IDS_APPNAME "ReactOS Device Manager" + IDS_APPNAME "Äèñïåò÷åð óñòðîéñòâ ReactOS" IDS_HINT_BLANK " " IDS_HINT_EXIT " Âûõîä èç ïðîãðàììû." IDS_HINT_REFRESH " Îáíîâèòü ñïèñîê." Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc Tue Jun 19 12:27:45 2007 @@ -63,12 +63,12 @@ END IDD_ABOUTBOX DIALOGEX 22,16,190,182 -CAPTION "Î Service Manager" +CAPTION "Î Ìåíåäæåðå ñëóæá" FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Service Manager v0.5\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 - PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 + LTEXT "Ìåíåäæåð ñëóæá v0.5\nCopyright (C) 2005-2006\nîò Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + PUSHBUTTON "Çàêðûòü", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END @@ -155,7 +155,7 @@ END IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 -CAPTION "Service Control" +CAPTION "Óïðàâëåíèå ñëóæáàìè" FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME EXSTYLE WS_EX_TOOLWINDOW @@ -250,34 +250,34 @@ STRINGTABLE DISCARDABLE BEGIN IDS_HINT_BLANK " " - IDS_HINT_EXPORT " Exports the current list to a file." - IDS_HINT_EXIT " Exits the program." - - IDS_HINT_CONNECT " Manage a different computer." - IDS_HINT_START " Start the selected service." - IDS_HINT_STOP " Stop the selected service." - IDS_HINT_PAUSE " Pause the selected service." - IDS_HINT_RESUME " Resume the selected service." - IDS_HINT_RESTART " Stop and start the selected service." - IDS_HINT_REFRESH " Refresh the service list." - IDS_HINT_EDIT " Edit the properties of the selected service." - IDS_HINT_CREATE " Create a new service." - IDS_HINT_DELETE " Delete the selected service." + IDS_HINT_EXPORT " Ýêñïîðò òåêóùåãî ñïèñêà â ôàéë." + IDS_HINT_EXIT " Âûõîä èç ïðîãðàììû." + + IDS_HINT_CONNECT " Óïðàâëåíèå äðóãèìè êîìïüþòåðàìè." + IDS_HINT_START " Çàïóñòèòü âûáðàííóþ ñëóæáó." + IDS_HINT_STOP " Îñòàíîâèòü âûáðàííóþ ñëóæáó." + IDS_HINT_PAUSE " Ïðèîñòàíîâèòü âûáðàííóþ ñëóæáó." + IDS_HINT_RESUME " Ïðîäîëæèòü âûáðàííóþ ñëóæáó." + IDS_HINT_RESTART " Ïåðåçàïóñê âûáðàííîé ñëóæáû." + IDS_HINT_REFRESH " Îáíîâèòü ñïèñîê ñëóæá." + IDS_HINT_EDIT " Èçìåíèòü ñâîéñòâà âûáðàííîé ñëóæáû." + IDS_HINT_CREATE " Ñîçäàòü íîâóþ ñëóæáó." + IDS_HINT_DELETE " Óäàëèòü âûáðàííóþ ñëóæáó." IDS_HINT_PROP " Open property sheet for the current selection." - IDS_HINT_LARGE " Display items by using large icons." - IDS_HINT_SMALL " Display items by using small icons." - IDS_HINT_LIST " Display item in a list." - IDS_HINT_DETAILS " Display information about each item in a window." - IDS_HINT_CUST " Customizes the view." - - IDS_HINT_HELP " Display help window." - IDS_HINT_ABOUT " About ReactOS Service Manager." - - IDS_HINT_SYS_RESTORE " Restores this window to normal size." - IDS_HINT_SYS_MOVE " Moves this window." - IDS_HINT_SYS_SIZE " Resizes this window." - IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." - IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." - IDS_HINT_SYS_CLOSE " Closes this window." -END + IDS_HINT_LARGE " Îòîáðàæàòü ýëåìåíòû â âèäå áîëüøèõ çíà÷êîâ." + IDS_HINT_SMALL " Îòîáðàæàòü ýëåìåíòû â âèäå ìàëåíüêèõ çíà÷êîâ." + IDS_HINT_LIST " Îòîáðàæàòü ýëåìåíòû â âèäå ñïèñêà." + IDS_HINT_DETAILS " Îòîáðàæåíèå èíôîðìàöèè î êàæäîì ýëåìåíòå â îêíå." + IDS_HINT_CUST " Íàñòðîéêà âèäà." + + IDS_HINT_HELP " Ïîêàçàòü îêíî ñïðàâêè." + IDS_HINT_ABOUT " Î Ìåíåäæåðå ñëóæá ReactOS." + + IDS_HINT_SYS_RESTORE " Âîñòàíîâèòü íîðìàëüíûé ðàçìåð îêíà." + IDS_HINT_SYS_MOVE " Ïåðåìåñòèòü ýòî îêíî." + IDS_HINT_SYS_SIZE " Èçìåíèòü ðàçìåð ýòîãî îêíà." + IDS_HINT_SYS_MINIMIZE " Ñâîðà÷èâàíèå îêíà â çíà÷îê." + IDS_HINT_SYS_MAXIMIZE " Ðàçâåðíóòü ýòî îêíî íà ïîëíûé ýêðàí." + IDS_HINT_SYS_CLOSE " Çàêðûòü ýòî îêíî." +END Modified: trunk/reactos/base/applications/notepad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/notepad/lang/ru-RU.rc Tue Jun 19 12:27:45 2007 @@ -144,10 +144,10 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Î ïðîãðàììå ReactOS Notepad" +CAPTION "Î ïðîãðàììå Áëîêíîò ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ", + CONTROL "Áëîêíîò ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ", -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39 CONTROL " ", -1,"Static",0x50000000,8,48,272,11 @@ -192,12 +192,12 @@ STRING_NOTFOUND, "'%s' íå íàéäåí." STRING_OUT_OF_MEMORY, "Íåäîñòàòî÷íî ïàìÿòè äëÿ çàâåðøåíèÿ ýòîé îïåðàöèè. \ \nÇàêðîéòå îäíî èëè íåñêîëüêî ïðèëîæåíèé è ïîâòîðèòå ïîïûòêó." -STRING_CANNOTFIND "Íå íàéäó '%s'" +STRING_CANNOTFIND "Íåâîçìîæíî íàéòè '%s'" STRING_ANSI, "ANSI" STRING_UNICODE, "Þíèêîä" STRING_UNICODE_BE, "Þíèêîä (big endian)" STRING_UTF8, "UTF-8" -STRING_CRLF, "Ôîðòî÷êè" -STRING_LF, "Þíèêñ" +STRING_CRLF, "Windows" +STRING_LF, "Unix" STRING_CR, "Ìàêèíòîø" } Modified: trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc Tue Jun 19 12:27:45 2007 @@ -21,7 +21,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_SNDVOL32 "Volume Control" + IDS_SNDVOL32 "Óïðàâëåíèå ãðîìêîñòüþ" IDS_NOMIXERDEVICES "Íåò äîñòóïíûõ ìèêøåðíûõ óñòðîéñòâ! Ïðèëîæåíèå áóäåò çàâåðøåíî." END Modified: trunk/reactos/base/setup/vmwinst/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/ru… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/ru-RU.rc (original) +++ trunk/reactos/base/setup/vmwinst/lang/ru-RU.rc Tue Jun 19 12:27:45 2007 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Ïðîãðàììà óñòàíîâêè îáíàðóæèëà, ÷òî ReactOS ðàáîòàåò ïîä óïðàâëåíèåì âèðòóàëüíîé ìàøèíû VMware(r).", -1, 100, 8, 160, 24 - LTEXT "Äëÿ óñòàíîâêè SVGA-äðàéâåðà VMware(r) íàæìèòå êíîïêó ""Äàëåå"", èíà÷å íàæìèòå ""Îòìåíà"".", -1, 100, 140, 160, 17 + LTEXT "Äëÿ óñòàíîâêè SVGA-äðàéâåðà VMware(r) íàæìèòå êíîïêó ""Äàëåå"", èíà÷å íàæìèòå ""Îòìåíà"".", -1, 100, 125, 160, 22 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/system/rundll32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/ru-RU.rc (original) +++ trunk/reactos/base/system/rundll32/lang/ru-RU.rc Tue Jun 19 12:27:45 2007 @@ -8,5 +8,5 @@ STRINGTABLE DISCARDABLE { IDS_DllNotLoaded, "Íåâîçìîæíî çàãðóçèòü áèáëèîòåêó '%s'" -IDS_MissingEntry, "Íåâîçìîæíî íàéòè òî÷êó âõîäà: %s\nÂ áèáëèîòåêå %s" +IDS_MissingEntry, "Íåâîçìîæíî íàéòè òî÷êó âõîäà: %s\nâ áèáëèîòåêå %s" }

17 years, 6 months

[arty] 27233: Not in LE mode anymore, toto.

by arty＠svn.reactos.org

Author: arty Date: Tue Jun 19 10:13:10 2007 New Revision: 27233 URL: http://svn.reactos.org/svn/reactos?rev=27233&view=rev Log: Not in LE mode anymore, toto. Modified: branches/powerpc/reactos/hal/halppc/generic/display.c branches/powerpc/reactos/hal/halppc/generic/portio.c Modified: branches/powerpc/reactos/hal/halppc/generic/display.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… ============================================================================== --- branches/powerpc/reactos/hal/halppc/generic/display.c (original) +++ branches/powerpc/reactos/hal/halppc/generic/display.c Tue Jun 19 10:13:10 2007 @@ -196,6 +196,8 @@ VOID STATIC FASTCALL HalPutCharacter (CHAR Character) { + WRITE_PORT_UCHAR((PVOID)0x3f8, Character); +#if 0 int i,j,k; ULONG Dest = (GraphVideoBuffer + @@ -213,6 +215,7 @@ } Dest += PpcEarlybootInfo.dispDeviceRowBytes; } +#endif } /* PRIVATE FUNCTIONS ********************************************************/ Modified: branches/powerpc/reactos/hal/halppc/generic/portio.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… ============================================================================== --- branches/powerpc/reactos/hal/halppc/generic/portio.c (original) +++ branches/powerpc/reactos/hal/halppc/generic/portio.c Tue Jun 19 10:13:10 2007 @@ -78,7 +78,6 @@ "mflr 0\n\t" "stwu 0,-16(1)\n\t" "mfmsr 5\n\t" - "xori 3,3,4\n\t" /* Undo effects of LE without swapping */ "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ "mtmsr 6\n\t" "isync\n\t" @@ -98,7 +97,6 @@ "mflr 0\n\t" "stwu 0,-16(1)\n\t" "mfmsr 5\n\t" - "xori 3,3,6\n\t" /* Undo effects of LE without swapping */ "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ "mtmsr 6\n\t" "isync\n\t" @@ -118,7 +116,6 @@ "mflr 0\n\t" "stwu 0,-16(1)\n\t" "mfmsr 5\n\t" - "xori 3,3,7\n\t" /* Undo effects of LE without swapping */ "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ "mtmsr 6\n\t" "isync\n\t" @@ -138,7 +135,6 @@ "mflr 0\n\t" "stwu 0,-16(1)\n\t" "mfmsr 5\n\t" - "xori 3,3,4\n\t" /* Undo effects of LE without swapping */ "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ "mtmsr 6\n\t" "sync\n\t" @@ -160,7 +156,6 @@ "mflr 0\n\t" "stwu 0,-16(1)\n\t" "mfmsr 5\n\t" - "xori 3,3,6\n\t" /* Undo effects of LE without swapping */ "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ "mtmsr 6\n\t" "sync\n\t" @@ -182,7 +177,6 @@ "mflr 0\n\t" "stwu 0,-16(1)\n\t" "mfmsr 5\n\t" - "xori 3,3,7\n\t" /* Undo effects of LE without swapping */ "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ "mtmsr 6\n\t" "sync\n\t"

17 years, 6 months

[greatlrd] 27232: Check the sub_lang before a commit I do not want other langues that english, like getting ukrain instead for english when the os are set to english

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jun 19 01:57:11 2007 New Revision: 27232 URL: http://svn.reactos.org/svn/reactos?rev=27232&view=rev Log: Check the sub_lang before a commit I do not want other langues that english, like getting ukrain instead for english when the os are set to english Modified: trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc Modified: trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc Tue Jun 19 01:57:11 2007 @@ -1,4 +1,4 @@ -LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc Tue Jun 19 01:57:11 2007 @@ -1,5 +1,5 @@ // Hungarian resource file by Peter Lukacs -LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc Tue Jun 19 01:57:11 2007 @@ -1,4 +1,4 @@ -LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc Tue Jun 19 01:57:11 2007 @@ -6,7 +6,7 @@ * TRANSLATOR: Artem Reznikov */ -LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION

17 years, 6 months

[dreimer] 27231: I don't know if it is a common phenomenon, but everytime I commit stuff, I IMMEDIATELY find things to fix/change afterwards.... - Added ability to set non, only executable or both parameters. Missing stuff will be asked for then. - Added Comments

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jun 19 01:49:44 2007 New Revision: 27231 URL: http://svn.reactos.org/svn/reactos?rev=27231&view=rev Log: I don't know if it is a common phenomenon, but everytime I commit stuff, I IMMEDIATELY find things to fix/change afterwards.... - Added ability to set non, only executable or both parameters. Missing stuff will be asked for then. - Added Comments Modified: trunk/tools/RosBE-Windows/Root/RAddr.cmd Modified: trunk/tools/RosBE-Windows/Root/RAddr.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RAddr.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RAddr.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RAddr.cmd Tue Jun 19 01:49:44 2007 @@ -10,17 +10,23 @@ title RAddr2Line... +:: +:: Receive the Parameters and decide what to do. +:: if "%1" == "" ( goto :MAN ) if not "%1" == "" ( if "%2" == "" ( - echo No Address Set. - goto :EOF + goto :AUTO1 ) else ( - goto :AUTO + goto :AUTO2 + ) ) +:: +:: If Parameters were set, parse them, if not, ask the user to add them. +:: :MAN echo Set the Path to the Executable to be examined. SET /P EXE= @@ -29,6 +35,14 @@ echo. echo. "%ROSBEBASEDIR%\Tools\raddr2line.exe" %EXE% %ADDR% +goto :EOF -:AUTO -"%ROSBEBASEDIR%\Tools\raddr2line.exe" %1 %2 +:AUTO1 +echo Set the Address you wanna analyze inside the Executable. +SET /P ADDR= +"%ROSBEBASEDIR%\Tools\raddr2line.exe" %1 %ADDR% +goto :EOF + +:AUTO2 +"%ROSBEBASEDIR%\Tools\raddr2line.exe" %1 %2 +goto :EOF

17 years, 6 months

[dreimer] 27230: - Disabled Christoph's Tool (Wish of some devs) - Added a basic RAddr2Line tool runner. More will come.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jun 19 01:38:53 2007 New Revision: 27230 URL: http://svn.reactos.org/svn/reactos?rev=27230&view=rev Log: - Disabled Christoph's Tool (Wish of some devs) - Added a basic RAddr2Line tool runner. More will come. Added: trunk/tools/RosBE-Windows/Root/RAddr.cmd Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/RosBE.mac Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Tue Jun 19 01:38:53 2007 @@ -7,6 +7,7 @@ - Added a config.rbuild Configurator. - Added grep/cut/sed Tools for the new Configurator. - Added SVN 1.4.4 for the SVN Feature. +- Added RAddr2Line Tool for the Devs out there. - Added use of ROS_LEAN_AND_MEAN by typeing "make/makex %command% strip". - Readded makex. Sorry, bug in Vista still persists... its a GCC bug. Added: trunk/tools/RosBE-Windows/Root/RAddr.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RAddr.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RAddr.cmd (added) +++ trunk/tools/RosBE-Windows/Root/RAddr.cmd Tue Jun 19 01:38:53 2007 @@ -1,0 +1,34 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See COPYING in the top level directory +:: FILE: Root/RAddr.cmd +:: PURPOSE: Analyze Adresses in Executables. +:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: +:: +@echo off + +title RAddr2Line... + +if "%1" == "" ( + goto :MAN +) +if not "%1" == "" ( + if "%2" == "" ( + echo No Address Set. + goto :EOF + ) else ( + goto :AUTO +) + +:MAN +echo Set the Path to the Executable to be examined. +SET /P EXE= +echo Set the Address you wanna analyze inside the Executable. +SET /P ADDR= +echo. +echo. +"%ROSBEBASEDIR%\Tools\raddr2line.exe" %EXE% %ADDR% + +:AUTO +"%ROSBEBASEDIR%\Tools\raddr2line.exe" %1 %2 Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.mac… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.mac (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.mac Tue Jun 19 01:38:53 2007 @@ -1,8 +1,8 @@ -BASEDIR = cd /d "%_ROSSOURCEDIR%" -CLEAN = "%ROSBEBASEDIR%\Clean.cmd" $* -SVN = "%ROSBEBASEDIR%\SVN.cmd" $* -CONFIG = "%ROSBEBASEDIR%\Config.cmd" $* -HELP = "%ROSBEBASEDIR%\Help.cmd" $* -MAKE = "%ROSBEBASEDIR%\Build.cmd" $* -MAKEX = "%ROSBEBASEDIR%\Build-Multi.cmd" $* -RELADDR2LINE = "%ROSBEBASEDIR%\reladdr2line.cmd" $* +BASEDIR = cd /d "%_ROSSOURCEDIR%" +CLEAN = "%ROSBEBASEDIR%\Clean.cmd" $* +SVN = "%ROSBEBASEDIR%\SVN.cmd" $* +CONFIG = "%ROSBEBASEDIR%\Config.cmd" $* +HELP = "%ROSBEBASEDIR%\Help.cmd" $* +MAKE = "%ROSBEBASEDIR%\Build.cmd" $* +MAKEX = "%ROSBEBASEDIR%\Build-Multi.cmd" $* +RADDR2LINE = "%ROSBEBASEDIR%\RAddr.cmd" $*

17 years, 6 months

[dreimer] 27229: - Head0rz t0 teh masses. - Fix a typo in Help.cmd

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jun 19 01:08:09 2007 New Revision: 27229 URL: http://svn.reactos.org/svn/reactos?rev=27229&view=rev Log: - Head0rz t0 teh masses. - Fix a typo in Help.cmd Modified: trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Tue Jun 19 01:08:09 2007 @@ -25,7 +25,7 @@ echo RosBE build logs. echo help [COMMAND] - Display the available commands or help on a echo specific command. - echo svn [OPTIONS] - Create, Update or clean up your ReactOS Source + echo svn [OPTIONS] - Create, Update or Clean-up your ReactOS Source echo Tree or show the Status. echo config [OPTIONS]- Configures the way, ReactOS will be built. echo. Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Tue Jun 19 01:08:09 2007 @@ -1,4 +1,13 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See COPYING in the top level directory +:: FILE: Root/reladdr2line.cmd +:: PURPOSE: Converts a value to hex and displays it +:: COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org> +:: +:: @echo off + for /f "tokens=2" %%i in ('"objdump -p %1 2>NUL | findstr ImageBase"') do SET baseaddr=0x%%i set /a baseaddr += 0x%2 for /f %%i in ('"%ROSBEBASEDIR%\Tools\echoh %baseaddr%"') do set relbase=%%i

17 years, 6 months

[cfinck] 27228: Add a "reladdr2line" tool coded by Christoph I slightly modified his batch file, so it integrates into RosBE

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Jun 19 00:54:50 2007 New Revision: 27228 URL: http://svn.reactos.org/svn/reactos?rev=27228&view=rev Log: Add a "reladdr2line" tool coded by Christoph I slightly modified his batch file, so it integrates into RosBE Added: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE-Windows/Tools/echoh.c Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.mac… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.mac (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.mac Tue Jun 19 00:54:50 2007 @@ -5,3 +5,4 @@ HELP = "%ROSBEBASEDIR%\Help.cmd" $* MAKE = "%ROSBEBASEDIR%\Build.cmd" $* MAKEX = "%ROSBEBASEDIR%\Build-Multi.cmd" $* +RELADDR2LINE = "%ROSBEBASEDIR%\reladdr2line.cmd" $* Added: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (added) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Tue Jun 19 00:54:50 2007 @@ -1,0 +1,5 @@ +@echo off +for /f "tokens=2" %%i in ('"objdump -p %1 2>NUL | findstr ImageBase"') do SET baseaddr=0x%%i +set /a baseaddr += 0x%2 +for /f %%i in ('"%ROSBEBASEDIR%\Tools\echoh %baseaddr%"') do set relbase=%%i +addr2line --exe=%1 %relbase% 2>NUL Added: trunk/tools/RosBE-Windows/Tools/echoh.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/echoh.c?… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/echoh.c (added) +++ trunk/tools/RosBE-Windows/Tools/echoh.c Tue Jun 19 00:54:50 2007 @@ -1,0 +1,17 @@ +/* + * PROJECT: RosBE - ReactOS Build Environment for Windows + * LICENSE: GPL - See COPYING in the top level directory + * FILE: Tools/echoh.c + * PURPOSE: Converts a value to hex and displays it + * COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org> + * + */ + + +#include <stdio.h> + +int main(int argc, char** argv) { + if (argc == 2) + printf("%x", atoi(argv[1])); + return 0; +}

17 years, 6 months

← Newer
1
...
9
10
11
12
13
14
15
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2007