[ros-diffs] [zguo] 28309: Merged 27832-27838, 27849, 27887, 27894-5, 27931 Still need to check on 27847, 27926, and 27928, whether they are needed
zguo at svn.reactos.org
zguo at svn.reactos.org
Mon Aug 13 04:02:42 CEST 2007
Author: zguo
Date: Mon Aug 13 06:02:40 2007
New Revision: 28309
URL: http://svn.reactos.org/svn/reactos?rev=28309&view=rev
Log:
Merged 27832-27838, 27849, 27887, 27894-5, 27931
Still need to check on 27847, 27926, and 27928, whether they are needed
Added:
branches/ros-branch-0_3_3/reactos/base/applications/charmap/lang/el-GR.rc
- copied unchanged from r27838, trunk/reactos/base/applications/charmap/lang/el-GR.rc
branches/ros-branch-0_3_3/reactos/base/applications/regedit/lang/pt-BR.rc
- copied unchanged from r27838, trunk/reactos/base/applications/regedit/lang/pt-BR.rc
branches/ros-branch-0_3_3/reactos/base/applications/wordpad/lang/el-GR.rc
- copied unchanged from r27838, trunk/reactos/base/applications/wordpad/lang/el-GR.rc
branches/ros-branch-0_3_3/reactos/dll/win32/user32/Gr.rc
- copied unchanged from r27838, trunk/reactos/dll/win32/user32/Gr.rc
branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_Br.rc
- copied unchanged from r27838, trunk/reactos/dll/win32/winmm/winmm_Br.rc
branches/ros-branch-0_3_3/reactos/subsystems/win32/csrss/win32csr/lang/el-GR.rc
- copied unchanged from r27838, trunk/reactos/subsystems/win32/csrss/win32csr/lang/el-GR.rc
Modified:
branches/ros-branch-0_3_3/reactos/base/applications/charmap/rsrc.rc
branches/ros-branch-0_3_3/reactos/base/applications/games/solitaire/solitaire.cpp
branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/bg-BG.rc
branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/de-DE.rc
branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/en-US.rc
branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/fr-FR.rc
branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/id-ID.rc
branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/it-IT.rc
branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nb-NO.rc
branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nl-NL.rc
branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/pl-PL.rc
branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/ru-RU.rc
branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/th-TH.rc
branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/uk-UA.rc
branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/zh-CN.rc
branches/ros-branch-0_3_3/reactos/base/applications/regedit/lang/pt-PT.rc
branches/ros-branch-0_3_3/reactos/base/applications/regedit/rsrc.rc
branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/graph.c
branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/lang/en-US.rc
branches/ros-branch-0_3_3/reactos/base/applications/winhelp/winhelp.h
branches/ros-branch-0_3_3/reactos/base/applications/wordpad/rsrc.rc
branches/ros-branch-0_3_3/reactos/base/shell/explorer-new/lang/sk-SK.rc
branches/ros-branch-0_3_3/reactos/dll/cpl/main/lang/ja-JP.rc
branches/ros-branch-0_3_3/reactos/dll/cpl/powercfg/lang/it-IT.rc
branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/startrec.c
branches/ros-branch-0_3_3/reactos/dll/keyboard/kbdhe/kbdhe.c
branches/ros-branch-0_3_3/reactos/dll/win32/comctl32/comctl_No.rc
branches/ros-branch-0_3_3/reactos/dll/win32/crypt32/crypt32_No.rc
branches/ros-branch-0_3_3/reactos/dll/win32/mpr/mpr_No.rc
branches/ros-branch-0_3_3/reactos/dll/win32/msi/msi_No.rc
branches/ros-branch-0_3_3/reactos/dll/win32/oledlg/oledlg_No.rc
branches/ros-branch-0_3_3/reactos/dll/win32/opengl32/wgl.c
branches/ros-branch-0_3_3/reactos/dll/win32/shell32/shell32_main.c
branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/el-GR.rc
branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/fr-FR.rc
branches/ros-branch-0_3_3/reactos/dll/win32/user32/user32.rc
branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_Pt.rc
branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_res.rc
branches/ros-branch-0_3_3/reactos/dll/win32/wldap32/wldap32_No.rc
branches/ros-branch-0_3_3/reactos/include/reactos/wine/debug.h
branches/ros-branch-0_3_3/reactos/subsystems/win32/csrss/win32csr/rsrc.rc
branches/ros-branch-0_3_3/rosapps/downloader/translations/it.rc
Modified: branches/ros-branch-0_3_3/reactos/base/applications/charmap/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/charmap/rsrc.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/charmap/rsrc.rc (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/charmap/rsrc.rc Mon Aug 13 06:02:40 2007
@@ -18,3 +18,4 @@
#include "lang/sk-SK.rc"
#include "lang/uk-UA.rc"
#include "lang/ru-RU.rc"
+#include "lang/el-GR.rc"
Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/solitaire/solitaire.cpp
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/games/solitaire/solitaire.cpp?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/games/solitaire/solitaire.cpp (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/games/solitaire/solitaire.cpp Mon Aug 13 06:02:40 2007
@@ -34,11 +34,6 @@
lstrcpy(ptr + 1, szExt);
}
-int main ( int argc, char** argv )
-{
- return WinMain ( NULL, NULL, NULL, SW_SHOW );
-}
-
//
// Main entry point
//
@@ -46,7 +41,7 @@
{
HWND hwnd;
MSG msg;
- WNDCLASSEX wndclass;
+ WNDCLASS wndclass;
INITCOMMONCONTROLSEX ice;
HACCEL hAccelTable;
@@ -60,7 +55,6 @@
LoadString(hInst, IDS_SOL_WIN, MsgWin, sizeof(MsgWin) / sizeof(MsgWin[0]));
//Window class for the main application parent window
- wndclass.cbSize = sizeof(wndclass);
wndclass.style = 0;//CS_HREDRAW | CS_VREDRAW;
wndclass.lpfnWndProc = WndProc;
wndclass.cbClsExtra = 0;
@@ -71,9 +65,8 @@
wndclass.hbrBackground = (HBRUSH)NULL;
wndclass.lpszMenuName = MAKEINTRESOURCE(IDR_MENU1);
wndclass.lpszClassName = szAppName;
- wndclass.hIconSm = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_SOLITAIRE), IMAGE_ICON, 16, 16, 0);
-
- RegisterClassEx(&wndclass);
+
+ RegisterClass(&wndclass);
ice.dwSize = sizeof(ice);
ice.dwICC = ICC_BAR_CLASSES;
Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/bg-BG.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/bg-BG.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/bg-BG.rc (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/bg-BG.rc Mon Aug 13 06:02:40 2007
@@ -84,8 +84,8 @@
PUSHBUTTON "Ïðåìåñòè íà&ãîðå", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12
PUSHBUTTON "Ïðåìåñòè íà&äîëó", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12
GROUPBOX "Ïóñêîâè íàñòðîéêè", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
- CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10
- CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10
+ CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10
+ CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/de-DE.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/de-DE.rc (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/de-DE.rc Mon Aug 13 06:02:40 2007
@@ -84,8 +84,8 @@
PUSHBUTTON "Nach &oben", IDC_BTN_MOVE_UP_BOOT_OPTION, 203, 65, 63, 12
PUSHBUTTON "Nach &unten", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 286, 65, 63, 12
GROUPBOX "Boot Optionen", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
- CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10
- CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10
+ CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10
+ CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/en-US.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/en-US.rc (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/en-US.rc Mon Aug 13 06:02:40 2007
@@ -83,8 +83,8 @@
PUSHBUTTON "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12
PUSHBUTTON "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12
GROUPBOX "Boot Options", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
- CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10
- CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10
+ CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10
+ CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/fr-FR.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/fr-FR.rc (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/fr-FR.rc Mon Aug 13 06:02:40 2007
@@ -83,8 +83,8 @@
PUSHBUTTON "&Monter", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12
PUSHBUTTON "&Descendre", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12
GROUPBOX "Options de démarrage", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
- CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10
- CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10
+ CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10
+ CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/id-ID.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/id-ID.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/id-ID.rc (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/id-ID.rc Mon Aug 13 06:02:40 2007
@@ -83,8 +83,8 @@
PUSHBUTTON "&Naik", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12
PUSHBUTTON "&Turun", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12
GROUPBOX "Opsi Boot", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
- CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10
- CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10
+ CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10
+ CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/it-IT.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/it-IT.rc (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/it-IT.rc Mon Aug 13 06:02:40 2007
@@ -83,8 +83,8 @@
PUSHBUTTON "&Sposta su", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12
PUSHBUTTON "S&posta giù", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12
GROUPBOX "Opzioni di Avvio", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
- CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10
- CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10
+ CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10
+ CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nb-NO.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nb-NO.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nb-NO.rc (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nb-NO.rc Mon Aug 13 06:02:40 2007
@@ -77,15 +77,15 @@
STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "Tahoma"
BEGIN
- CONTROL "", IDC_LIST_BOX, "Listeboks", 0x50010141, 10, 10, 340, 50, 0x00000200
+ CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200
PUSHBUTTON "&Sjekk alle oppstartsbaner", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
PUSHBUTTON "&Sett som standard", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12
PUSHBUTTON "Flytt &Opp", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12
PUSHBUTTON "Flytt &Ned", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12
GROUPBOX "Oppstarts alternativer", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
- CHECKBOX "/&SIKKEROPPSTART", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10
+ CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10
CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10
- CHECKBOX "/&OPPSTARTLOGG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
+ CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
PUSHBUTTON "Av&anserte alternativer...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12
Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nl-NL.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nl-NL.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nl-NL.rc (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nl-NL.rc Mon Aug 13 06:02:40 2007
@@ -103,8 +103,8 @@
PUSHBUTTON "&Omhoog", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12
PUSHBUTTON "Om&laag", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12
GROUPBOX "Opstartopties", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
- CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10
- CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10
+ CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10
+ CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/pl-PL.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/pl-PL.rc (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/pl-PL.rc Mon Aug 13 06:02:40 2007
@@ -89,8 +89,8 @@
PUSHBUTTON "Przenieœ w &górê", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12
PUSHBUTTON "Przenieœ w &dó³", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12
GROUPBOX "Opcje rozruchu", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
- CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10
- CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10
+ CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10
+ CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/ru-RU.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/ru-RU.rc (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/ru-RU.rc Mon Aug 13 06:02:40 2007
@@ -85,8 +85,8 @@
PUSHBUTTON "&Ââåðõ", IDC_BTN_MOVE_UP_BOOT_OPTION, 200, 65, 70, 12
PUSHBUTTON "Â&íèç", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 275, 65, 70, 12
GROUPBOX "Ïàðàìåòðû çàãðóçêè", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
- CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10
- CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10
+ CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10
+ CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/th-TH.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/th-TH.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/th-TH.rc (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/th-TH.rc Mon Aug 13 06:02:40 2007
@@ -97,15 +97,15 @@
STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_LIST_BOX, "¡ÅèͧÃÒª×èÍ", 0x50010141, 10, 10, 340, 50, 0x00000200
+ CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200
PUSHBUTTON "&µÃǨ¡ÒûÅØ¡à¤Ã×èͧ·Ø¡àÊé¹·Ò§", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
PUSHBUTTON "&µÑ駤èÒâ´Â»ÃÔÂÒÂ", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12
PUSHBUTTON "à¤Å×è͹·Õè &¢Öé¹", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12
PUSHBUTTON "à¤Å×è͹·Õè &ŧ", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12
GROUPBOX "µÑÇàÅ×Í¡¡ÒûÅØ¡à¤Ã×èͧ", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
- CHECKBOX "/»ÅØ¡à¤Ã×èͧẺ&»ÅÍ´ÀÑÂ", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10
- CHECKBOX "/»ÅØ¡à¤Ã×èͧẺ&ÊèǹµèÍ»ÃÐÊÒ¹¡ÃÒ¿Ô¡", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10
- CHECKBOX "/&ŧºÑ¹·Ö¡»ÅØ¡à¤Ã×èͧ", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
+ CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10
+ CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10
+ CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
PUSHBUTTON "&µÑÇàÅ×Í¡ÃдѺÊÙ§...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12
Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/uk-UA.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/uk-UA.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/uk-UA.rc (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/uk-UA.rc Mon Aug 13 06:02:40 2007
@@ -91,8 +91,8 @@
PUSHBUTTON "Ïåðåì³ñòèòè Ââ&åðõ", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12
PUSHBUTTON "Ïåðåì³ñòèòè äî &íèçó", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12
GROUPBOX "Âàð³àíòè çàâàíòàæåííÿ", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
- CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10
- CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10
+ CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10
+ CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/zh-CN.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/zh-CN.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/zh-CN.rc (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/zh-CN.rc Mon Aug 13 06:02:40 2007
@@ -103,8 +103,8 @@
PUSHBUTTON "ÉÏÒÆ(&U)", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12
PUSHBUTTON "ÏÂÒÆ(&D)", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12
GROUPBOX "Æô¶¯Ñ¡Ïî", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
- CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10
- CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10
+ CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10
+ CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
Modified: branches/ros-branch-0_3_3/reactos/base/applications/regedit/lang/pt-PT.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/regedit/lang/pt-PT.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/regedit/lang/pt-PT.rc (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/regedit/lang/pt-PT.rc Mon Aug 13 06:02:40 2007
@@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_PORTUGAL
ID_ACCEL ACCELERATORS
{
Modified: branches/ros-branch-0_3_3/reactos/base/applications/regedit/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/regedit/rsrc.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/regedit/rsrc.rc (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/regedit/rsrc.rc Mon Aug 13 06:02:40 2007
@@ -41,6 +41,7 @@
#include "lang/ja-JP.rc"
#include "lang/nl-NL.rc"
#include "lang/pl-PL.rc"
+#include "lang/pt-BR.rc"
#include "lang/pt-PT.rc"
#include "lang/ru-RU.rc"
#include "lang/sl-SI.rc"
Modified: branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/graph.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/graph.c?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/graph.c (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/graph.c Mon Aug 13 06:02:40 2007
@@ -137,6 +137,7 @@
RECT rcText;
COLORREF crPrevForeground;
TCHAR Text[260];
+ HFONT hFont, hOldFont;
ULONG CpuUsage;
ULONG CpuKernelUsage;
int nBars;
@@ -173,7 +174,10 @@
rcText = rcClient;
InflateRect(&rcText, -2, -2);
crPrevForeground = SetTextColor(hDC, RGB(0, 255, 0));
+ hFont = GetStockObject(DEFAULT_GUI_FONT);
+ hOldFont = SelectObject(hDC, hFont);
DrawText(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE);
+ SelectObject(hDC, hOldFont);
SetTextColor(hDC, crPrevForeground);
/*
@@ -303,6 +307,7 @@
RECT rcText;
COLORREF crPrevForeground;
TCHAR Text[260];
+ HFONT hFont, hOldFont;
ULONGLONG CommitChargeTotal;
ULONGLONG CommitChargeLimit;
int nBars;
@@ -338,7 +343,10 @@
rcText = rcClient;
InflateRect(&rcText, -2, -2);
crPrevForeground = SetTextColor(hDC, RGB(0, 255, 0));
+ hFont = GetStockObject(DEFAULT_GUI_FONT);
+ hOldFont = SelectObject(hDC, hFont);
DrawText(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE);
+ SelectObject(hDC, hOldFont);
SetTextColor(hDC, crPrevForeground);
/*
Modified: branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/lang/en-US.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/lang/en-US.rc (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/lang/en-US.rc Mon Aug 13 06:02:40 2007
@@ -179,7 +179,7 @@
STYLE DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
WS_THICKFRAME
-CAPTION "Task Manager"
+CAPTION "ReactOS Task Manager"
MENU IDR_TASKMANAGER
FONT 8, "MS Shell Dlg"
BEGIN
Modified: branches/ros-branch-0_3_3/reactos/base/applications/winhelp/winhelp.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/winhelp/winhelp.h?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/winhelp/winhelp.h (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/winhelp/winhelp.h Mon Aug 13 06:02:40 2007
@@ -32,8 +32,6 @@
#define SHADOW_DY 10
#define BUTTON_CX 6
#define BUTTON_CY 6
-
-#define WINE_WARN DPRINT
#ifndef RC_INVOKED
Modified: branches/ros-branch-0_3_3/reactos/base/applications/wordpad/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/applications/wordpad/rsrc.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/applications/wordpad/rsrc.rc (original)
+++ branches/ros-branch-0_3_3/reactos/base/applications/wordpad/rsrc.rc Mon Aug 13 06:02:40 2007
@@ -15,3 +15,4 @@
#include "lang/th-TH.rc"
#include "lang/uk-UA.rc"
#include "lang/zh-CN.rc"
+#include "lang/el-GR.rc"
Modified: branches/ros-branch-0_3_3/reactos/base/shell/explorer-new/lang/sk-SK.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/shell/explorer-new/lang/sk-SK.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/base/shell/explorer-new/lang/sk-SK.rc (original)
+++ branches/ros-branch-0_3_3/reactos/base/shell/explorer-new/lang/sk-SK.rc Mon Aug 13 06:02:40 2007
@@ -4,7 +4,7 @@
BEGIN
POPUP ""
BEGIN
- MENUITEM "Za&mknúť panel úloh", ID_LOCKTASKBAR
+ MENUITEM "Za&mknú panel úloh", ID_LOCKTASKBAR
MENUITEM "&Vlastnosti", ID_SHELL_CMD_PROPERTIES
END
END
@@ -18,7 +18,7 @@
BEGIN
MENUITEM "(Prázdne)", -1, MFT_STRING, MFS_GRAYED
END
- POPUP "O&bľúbené položky", IDM_FAVORITES
+ POPUP "O&b¾úbené položky", IDM_FAVORITES
BEGIN
MENUITEM "(Prázdne)", -1, MFT_STRING, MFS_GRAYED
END
@@ -30,23 +30,23 @@
BEGIN
MENUITEM "&Ovládaci panel", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED
MENUITEM SEPARATOR
- MENUITEM "&Zabezpečenie systému ReactOS...", IDM_SECURITY, MFT_STRING, MFS_ENABLED
- MENUITEM "Sieťové pripoje&nia", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED
- MENUITEM "&Tlačiarne a faxy", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED
+ MENUITEM "&Zabezpeèenie systému ReactOS...", IDM_SECURITY, MFT_STRING, MFS_ENABLED
+ MENUITEM "Sieové pripoje&nia", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED
+ MENUITEM "&Tlaèiarne a faxy", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED
MENUITEM "P&anel úloh a ponuka Štart", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED
END
- POPUP "&Hľadať", IDM_SEARCH
+ POPUP "&H¾ada", IDM_SEARCH
BEGIN
MENUITEM SEPARATOR
END
MENUITEM "&Pomoc a technická podpora", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED
- MENUITEM "Sp&ustiť...", IDM_RUN, MFT_STRING, MFS_ENABLED
+ MENUITEM "Sp&usti...", IDM_RUN, MFT_STRING, MFS_ENABLED
MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED
- MENUITEM "&Synchronizovať", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED
- MENUITEM "O&dhlásiť používateľa %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED
- MENUITEM "&Odpojiť...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED
- MENUITEM "Vybr&ať počítač z doku", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED
- MENUITEM "&Vypnúť...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED
+ MENUITEM "&Synchronizova", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED
+ MENUITEM "O&dhlási používate¾a %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED
+ MENUITEM "&Odpoji...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED
+ MENUITEM "Vybr&a poèítaè z doku", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED
+ MENUITEM "&Vypnú...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED
END
END
@@ -54,6 +54,6 @@
BEGIN
IDS_START "Štart"
IDS_PROPERTIES "Vl&astnosti"
- IDS_OPEN_ALL_USERS "&Otvoriť profil All Users"
- IDS_EXPLORE_ALL_USERS "&Preskúmať profil All Users"
+ IDS_OPEN_ALL_USERS "&Otvori profil All Users"
+ IDS_EXPLORE_ALL_USERS "&Preskúma profil All Users"
END
Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/main/lang/ja-JP.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cpl/main/lang/ja-JP.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/dll/cpl/main/lang/ja-JP.rc (original)
+++ branches/ros-branch-0_3_3/reactos/dll/cpl/main/lang/ja-JP.rc Mon Aug 13 06:02:40 2007
@@ -115,7 +115,7 @@
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_SHORT, 160, 130, 30, 10
+ LTEXT "Long", 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
Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/powercfg/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cpl/powercfg/lang/it-IT.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/dll/cpl/powercfg/lang/it-IT.rc (original)
+++ branches/ros-branch-0_3_3/reactos/dll/cpl/powercfg/lang/it-IT.rc Mon Aug 13 06:02:40 2007
@@ -5,31 +5,40 @@
CAPTION "Gestione risparmio energia"
FONT 8, "MS Shell Dlg"
BEGIN
- ICON IDI_ACDC, IDI_ACDC, 7,7,28,22
- LTEXT "Sgegli lo schema di gestione dell'energia con le impostazioni piu' appropriate per questo computer. La modifica delle impostazioni seguenti altera lo schema selezionato.",
- -1,45,13,194,36
- GROUPBOX "Schema di gestione dell'energia", -1, 7,57,240,46
- COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "&Salva come...", -1, 100,85,75,15,WS_DISABLED
- PUSHBUTTON "&Cancella", -1, 180,85,55,15,WS_DISABLED
- GROUPBOX "sconosciuto", IDC_GRPDETAIL, 7,108,240,105
- LTEXT "Quando il computer è:",IDC_SAT,15,120,60,10
- LTEXT "Alimentazione da rete",IDC_SAC,100,120,45,15
- ICON IDI_AC, IDC_IAC, 75,115,25,15
- LTEXT "Alimentazione a batterie",IDC_SDC,197,120,45,15
- ICON IDI_DC, IDC_IDC, 165,115,25,15
- LTEXT "Spegni il &monitor:",IDC_MONITOR,15,145,80,10
- COMBOBOX IDC_MONITORACLIST, 100,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- COMBOBOX IDC_MONITORDCLIST, 175,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- LTEXT "Spegni i d&ischi fissi:",IDC_DISK,15,160,80,10
- COMBOBOX IDC_DISKACLIST, 100,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- COMBOBOX IDC_DISKDCLIST, 175,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- LTEXT "Stadby:",IDC_STANDBY,15,180,80,10
- COMBOBOX IDC_STANDBYACLIST, 100,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- COMBOBOX IDC_STANDBYDCLIST, 175,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- LTEXT "Sospensione:",IDC_HYBERNATE,15,195,80,10
- COMBOBOX IDC_HYBERNATEACLIST, 100,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- COMBOBOX IDC_HYBERNATEDCLIST, 175,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ ICON IDI_ACDC,IDI_ACDC,7,7,20,20
+ LTEXT "Scegliere lo schema di gestione dell'energia con le impostazioni piu' appropriate per questo computer. La modifica delle impostazioni seguenti altera lo schema selezionato.",
+ -1,40,8,194,36
+ GROUPBOX "Schema di gestione dell'energia",-1,8,48,240,48
+ COMBOBOX IDC_ENERGYLIST,15,61,224,92,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+ PUSHBUTTON "&Salva come...",-1,101,76,75,15,WS_DISABLED
+ PUSHBUTTON "&Cancella",-1,181,76,55,15,WS_DISABLED
+ GROUPBOX "sconosciuto",IDC_GRPDETAIL,8,100,240,112
+ LTEXT "Quando il computer è:",IDC_SAT,16,112,72,16
+ LTEXT "Alimentato\rda rete",IDC_SAC,120,112,45,15
+ ICON IDI_AC,IDC_IAC,96,112,21,20
+ LTEXT "Alimentato\ra batterie",IDC_SDC,192,112,45,15
+ ICON IDI_DC,IDC_IDC,168,112,21,20
+ LTEXT "Spegni il &monitor:",IDC_MONITOR,16,143,80,10
+ COMBOBOX IDC_MONITORACLIST,101,141,65,150,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_MONITORDCLIST,176,141,65,150,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+ LTEXT "Spegni i d&ischi fissi:",IDC_DISK,16,158,80,10
+ COMBOBOX IDC_DISKACLIST,101,156,65,150,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_DISKDCLIST,176,156,65,150,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+ LTEXT "Standby:",IDC_STANDBY,16,178,80,10
+ COMBOBOX IDC_STANDBYACLIST,101,176,65,150,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_STANDBYDCLIST,176,176,65,150,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+ LTEXT "Sospensione:",IDC_HYBERNATE,16,193,80,10
+ COMBOBOX IDC_HYBERNATEACLIST,101,191,65,150,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_HYBERNATEDCLIST,176,191,65,150,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
END
IDD_PROPPAGEALARMS DIALOG DISCARDABLE 0, 0, 250, 220
@@ -38,11 +47,12 @@
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Allarme di batteria bassa",-1,10,15,235,95
- CONTROL "Attiva l'Allarme di batteria bassa quando il livello batteria è:",IDC_ALARM1,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,25,180,15
+ CONTROL "Attiva l'Allarme di batteria bassa quando il livello batteria è:",
+ IDC_ALARM1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,25,
+ 180,15
LTEXT "sconosciuto",IDC_ALARMVALUE1,200,25,40,10
LTEXT "0%",-1,20,40,15,15
- CONTROL "Slider1",IDC_ALARMBAR1,"msctls_trackbar32",TBS_HORZ |
+ CONTROL "Slider1",IDC_ALARMBAR1,"msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP,30,40,170,15
LTEXT "100%",-1,215,40,25,10
PUSHBUTTON "Azione allarmi...",-1,20,70,70,15,WS_DISABLED
@@ -52,13 +62,12 @@
LTEXT "Unknown",IDC_ALARMAKTION1,145,80,95,10
LTEXT "Esegui:",-1,95,90,50,10
LTEXT "Unknown",IDC_ALARMPROG1,150,90,40,10
-
GROUPBOX "Allarme critico di batteria",-1,10,115,235,95
- CONTROL "Attiva l'Allarme di batteria bassa quando il livello batteria è:",IDC_ALARM2,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,125,180,15
+ CONTROL "Attiva l'Allarme di batteria bassa quando il livello batteria è:",
+ IDC_ALARM2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,125,180,15
LTEXT "unknown",IDC_ALARMVALUE2,200,125,40,10
LTEXT "0%",-1,20,140,15,15
- CONTROL "Slider1",IDC_ALARMBAR2,"msctls_trackbar32",TBS_HORZ |
+ CONTROL "Slider1",IDC_ALARMBAR2,"msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP,30,140,170,15
LTEXT "100%",-1,215,140,25,10
PUSHBUTTON "Azione allarmi...",-1,20,170,70,15,WS_DISABLED
@@ -72,47 +81,55 @@
IDD_PROPPAGEADVANCED DIALOG DISCARDABLE 0, 0, 250, 220
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Advanced"
+CAPTION "Avanzate"
FONT 8, "MS Shell Dlg"
BEGIN
ICON IDI_ACDC,IDI_ACDC,5,5,20,20
- LTEXT "Scegli le impostazioni di risparmi energia che intendi usare.",-1,30,5,205,20
+ LTEXT "Scegli le impostazioni di risparmi energia che intendi usare.",
+ -1,30,5,205,20
GROUPBOX "Opzioni",-1,5,35,225,55
- CONTROL "Mostra sempre l'icona nella barra dei task",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX |
+ CONTROL "Mostra sempre l'icona nella barra dei task",
+ IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,15,45,200,10
- CONTROL "Chiedi la password al ripristino dallo standby",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,15,55,200,10
- CONTROL "Attenua il video durante il funzionamento a batteria.",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX |
+ CONTROL "Chiedi la password al ripristino dallo standby",
+ IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
+ 15,55,200,10
+ CONTROL "Attenua il video durante il funzionamento a batteria.",
+ IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,15,65,200,10
GROUPBOX "Pulsanti di gestione",-1,5,100,230,105
- LTEXT "Quando chiudo lo schermo del computer portatile:", IDC_SLIDCLOSE,10,110,210,10
+ LTEXT "Quando chiudo lo schermo del computer portatile:",
+ IDC_SLIDCLOSE,10,110,210,10
COMBOBOX IDC_LIDCLOSE,10,120,220,90,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- LTEXT "Quando premo il pulsante di alimentazione del computer:", IDC_SPOWERBUTTON,10,135,210,10
- COMBOBOX IDC_POWERBUTTON,10,150,220,90,CBS_DROPDOWNLIST | CBS_SORT |
- WS_VSCROLL | WS_TABSTOP
- LTEXT "Quando premo il pulsante di sospensione del computer:", IDC_SSLEEPBUTTON,10,165,210,10
- COMBOBOX IDC_SLEEPBUTTON,10,180,220,90,CBS_DROPDOWNLIST | CBS_SORT |
- WS_VSCROLL | WS_TABSTOP
+ LTEXT "Quando premo il pulsante di alimentazione del computer:",
+ IDC_SPOWERBUTTON,10,135,210,10
+ COMBOBOX IDC_POWERBUTTON,10,150,220,90,CBS_DROPDOWNLIST |
+ CBS_SORT | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Quando premo il pulsante di sospensione del computer:",
+ IDC_SSLEEPBUTTON,10,165,210,10
+ COMBOBOX IDC_SLEEPBUTTON,10,180,220,90,CBS_DROPDOWNLIST |
+ CBS_SORT | WS_VSCROLL | WS_TABSTOP
END
IDD_PROPPAGEHIBERNATE DIALOG DISCARDABLE 0, 0, 250, 220
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Hibernate"
+CAPTION "Sospensione"
FONT 8, "MS Shell Dlg"
BEGIN
ICON IDI_SCREEN,IDI_SCREEN,5,5,20,20
- LTEXT "quando il computer viene sospeso viene salvato il contenuto della ram su disco e poi si spegne. Alla riaccensione si ripresenta nello stato in cui si trovava. ",
+ LTEXT "Quando il computer viene sospeso, il contenuto della RAM viene salvato su disco e poi il sistema si spegne. Alla riaccensione il computer si ripresenta nello stato in cui si trovava.",
-1,35,5,195,35
- GROUPBOX "Sospensione",-1,5,45,235,25
- CONTROL "Abilita la Sospensione",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,10,55,210,10
- GROUPBOX "Spazio su disco per la Sospensione",-1,5,80,240,60
+ GROUPBOX "Sospensione",-1,5,45,239,25
+ CONTROL "Abilita la Sospensione",IDC_HIBERNATEFILE,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,10,55,210,10
+ GROUPBOX "Spazio su disco per la Sospensione",-1,5,80,240,73
LTEXT "Spazio su disco libero:",-1,10,90,100,10
LTEXT "Unknown",IDC_FREESPACE,120,90,70,10
- LTEXT "Spazio su disco richiesto per la sospensione:",-1,10,100,115,10
+ LTEXT "Spazio su disco richiesto per la sospensione:",-1,10,100,101,17
LTEXT "Unknown",IDC_SPACEFORHIBERNATEFILE,120,100,55,10
- LTEXT "Deve essere liberato dello spazio su disco prima che il computer possa essere sospeso. ",IDC_TOLESSFREESPACE,10,115,220,20
+ LTEXT "Deve essere liberato dello spazio su disco prima che il computer possa essere sospeso.",
+ IDC_TOLESSFREESPACE,10,129,220,20
END
STRINGTABLE
@@ -131,7 +148,7 @@
IDS_NOACTION "Nessuna azione"
IDS_PowerActionNone1 "Nessuna azione"
- IDS_PowerActionUnknown "Unknown"
+ IDS_PowerActionUnknown "Sconosciuto"
IDS_PowerActionSleep "Stand by"
IDS_PowerActionHibernate "Sospendi"
IDS_PowerActionShutdown "Ferma"
@@ -157,4 +174,3 @@
IDS_TIMEOUT15 "Dopo 5 hours"
IDS_TIMEOUT16 "Mai"
END
-
Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/startrec.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/startrec.c?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/startrec.c (original)
+++ branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/startrec.c Mon Aug 13 06:02:40 2007
@@ -12,6 +12,8 @@
#include "precomp.h"
static TCHAR m_szFreeldrIni[MAX_PATH + 15];
+static TCHAR szBootLdrSection[12];
+static TCHAR szBootLdrDefault[10];
void SetTimeout(HWND hwndDlg, int Timeout)
{
@@ -72,6 +74,7 @@
FailGetSysDrive:
HeapFree(GetProcessHeap(), 0, szSystemDrive);
szSystemDrive = NULL;
+ return FALSE;
}
if (szSystemDrive != NULL)
@@ -84,22 +87,32 @@
{
_tcscpy(m_szFreeldrIni, szSystemDrive);
_tcscat(m_szFreeldrIni, _T("\\boot.ini"));
+ _tcscpy(szBootLdrSection, _T("boot loader"));
+ _tcscpy(szBootLdrDefault, _T("default"));
+ }
+ else
+ {
+ _tcscpy(szBootLdrSection, _T("FREELOADER"));
+ _tcscpy(szBootLdrDefault, _T("DefaultOS"));
}
}
HeapFree(GetProcessHeap(), 0, szSystemDrive);
}
}
+ if (m_szFreeldrIni == NULL)
+ return FALSE;
+
SetDlgItemText(hwndDlg, IDC_STRRECDUMPFILE, _T("%SystemRoot%\\MiniDump"));
/* load settings from freeldr.ini */
- GetPrivateProfileString(_T("boot loader"), _T("default"), NULL, szDefaultOS, MAX_PATH, m_szFreeldrIni);
+ GetPrivateProfileString(szBootLdrSection, szBootLdrDefault, NULL, szDefaultOS, MAX_PATH, m_szFreeldrIni);
GetPrivateProfileString(_T("operating systems"), szDefaultOS, NULL, szDefaultOSName, MAX_PATH, m_szFreeldrIni);
SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szDefaultOSName);
SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)0, (LPARAM)0);
/* timeout */
- iTimeout = GetPrivateProfileInt(_T("boot loader"), _T("timeout"), 0, m_szFreeldrIni);
+ iTimeout = GetPrivateProfileInt(szBootLdrSection, _T("timeout"), 0, m_szFreeldrIni);
SetTimeout(hwndDlg, iTimeout);
if (iTimeout != 0)
SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
@@ -124,7 +137,7 @@
else
iTimeout = 0;
_stprintf(szTimeout, _T("%i"), iTimeout);
- WritePrivateProfileString(_T("boot loader"), _T("timeout"), szTimeout, m_szFreeldrIni);
+ WritePrivateProfileString(szBootLdrSection, _T("timeout"), szTimeout, m_szFreeldrIni);
}
case IDCANCEL:
{
Modified: branches/ros-branch-0_3_3/reactos/dll/keyboard/kbdhe/kbdhe.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/keyboard/kbdhe/kbdhe.c?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/dll/keyboard/kbdhe/kbdhe.c (original)
+++ branches/ros-branch-0_3_3/reactos/dll/keyboard/kbdhe/kbdhe.c Mon Aug 13 06:02:40 2007
@@ -144,11 +144,11 @@
{ '8', NOCAPS, {'8', '*'} },
{ '9', NOCAPS, {'9', '('} },
{ '0', NOCAPS, {'0', ')'} },
-
+ { 'Q', NOCAPS, {';', ':'} },
+
/* Specials */
/* Ctrl-_ generates GR */
{ VK_OEM_PLUS ,NOCAPS, {'=', '+'} },
- //{ VK_OEM_1 ,NOCAPS, {';', ':'} },
{ VK_OEM_7 ,NOCAPS, {'\'','\"'} },
{ VK_OEM_3 ,NOCAPS, {'`', '~'} },
{ VK_OEM_COMMA ,NOCAPS, {',', '<'} },
@@ -199,7 +199,7 @@
{ 'N', CAPS, {0x3BD, 0x39D} },
{ 'O', CAPS, {0x3BF, 0x39F} },
{ 'P', CAPS, {0x3C0, 0x3A0} },
- { 'Q', CAPS, { ';' , ';' } },
+// { 'Q', CAPS, { ';' , ';' } },
{ 'R', CAPS, {0x3C1, 0x3A1} },
{ 'S', CAPS, {0x3C3, 0x3A3} },
{ 'T', CAPS, {0x3C4, 0x3A4} },
@@ -386,4 +386,3 @@
PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
return &keyboard_layout_table;
}
-
Modified: branches/ros-branch-0_3_3/reactos/dll/win32/comctl32/comctl_No.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/win32/comctl32/comctl_No.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/dll/win32/comctl32/comctl_No.rc (original)
+++ branches/ros-branch-0_3_3/reactos/dll/win32/comctl32/comctl_No.rc Mon Aug 13 06:02:40 2007
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
Modified: branches/ros-branch-0_3_3/reactos/dll/win32/crypt32/crypt32_No.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/win32/crypt32/crypt32_No.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/dll/win32/crypt32/crypt32_No.rc (original)
+++ branches/ros-branch-0_3_3/reactos/dll/win32/crypt32/crypt32_No.rc Mon Aug 13 06:02:40 2007
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE
{
Modified: branches/ros-branch-0_3_3/reactos/dll/win32/mpr/mpr_No.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/win32/mpr/mpr_No.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/dll/win32/mpr/mpr_No.rc (original)
+++ branches/ros-branch-0_3_3/reactos/dll/win32/mpr/mpr_No.rc Mon Aug 13 06:02:40 2007
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE
{
Modified: branches/ros-branch-0_3_3/reactos/dll/win32/msi/msi_No.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/win32/msi/msi_No.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/dll/win32/msi/msi_No.rc (original)
+++ branches/ros-branch-0_3_3/reactos/dll/win32/msi/msi_No.rc Mon Aug 13 06:02:40 2007
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE
{
Modified: branches/ros-branch-0_3_3/reactos/dll/win32/oledlg/oledlg_No.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/win32/oledlg/oledlg_No.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/dll/win32/oledlg/oledlg_No.rc (original)
+++ branches/ros-branch-0_3_3/reactos/dll/win32/oledlg/oledlg_No.rc Mon Aug 13 06:02:40 2007
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
Modified: branches/ros-branch-0_3_3/reactos/dll/win32/opengl32/wgl.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/win32/opengl32/wgl.c?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/dll/win32/opengl32/wgl.c (original)
+++ branches/ros-branch-0_3_3/reactos/dll/win32/opengl32/wgl.c Mon Aug 13 06:02:40 2007
@@ -582,7 +582,7 @@
}
/* I think this is only possible within one ICD */
- if (src->icd != src->icd)
+ if (src->icd != dst->icd)
{
DBGPRINT( "Error: src and dst GLRC use different ICDs!" );
SetLastError( ERROR_INVALID_HANDLE );
Modified: branches/ros-branch-0_3_3/reactos/dll/win32/shell32/shell32_main.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/win32/shell32/shell32_main.c?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/dll/win32/shell32/shell32_main.c (original)
+++ branches/ros-branch-0_3_3/reactos/dll/win32/shell32/shell32_main.c Mon Aug 13 06:02:40 2007
@@ -509,23 +509,59 @@
/* get the iconlocation */
if (SUCCEEDED(hr) && (flags & SHGFI_ICONLOCATION ))
{
- UINT uDummy,uFlags;
-
- hr = IShellFolder_GetUIObjectOf(psfParent, 0, 1,
- (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconA,
- &uDummy, (LPVOID*)&pei);
- if (SUCCEEDED(hr))
- {
- hr = IExtractIconW_GetIconLocation(pei, uGilFlags,
- szLocation, MAX_PATH, &iIndex, &uFlags);
- psfi->iIcon = iIndex;
-
- if (!(uFlags & GIL_NOTFILENAME))
- lstrcpyW (psfi->szDisplayName, szLocation);
+ if (!(flags & SHGFI_USEFILEATTRIBUTES))
+ {
+ UINT uDummy,uFlags;
+
+ hr = IShellFolder_GetUIObjectOf(psfParent, 0, 1,
+ (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconA,
+ &uDummy, (LPVOID*)&pei);
+ if (SUCCEEDED(hr))
+ {
+ hr = IExtractIconW_GetIconLocation(pei, uGilFlags,
+ szLocation, MAX_PATH, &iIndex, &uFlags);
+ psfi->iIcon = iIndex;
+
+ if (!(uFlags & GIL_NOTFILENAME))
+ lstrcpyW (psfi->szDisplayName, szLocation);
+ else
+ ret = FALSE;
+
+ IExtractIconA_Release(pei);
+ }
+ }
+ else
+ {
+ if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+ {
+ strcpyW(psfi->szDisplayName, swShell32Name);
+ psfi->iIcon = SIC_GetIconIndex(swShell32Name, -IDI_SHELL_FOLDER, 0);
+ }
else
- ret = FALSE;
-
- IExtractIconA_Release(pei);
+ {
+ WCHAR sTemp [MAX_PATH];
+ WCHAR * szExt;
+ DWORD dwNr=0;
+ static const WCHAR p1W[] = {'%','1',0};
+
+ lstrcpynW(sTemp, szFullPath, MAX_PATH);
+
+ psfi->iIcon = 0;
+ szExt = (LPWSTR) PathFindExtensionW(sTemp);
+ if ( szExt &&
+ HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) &&
+ HCR_GetDefaultIconW(sTemp, sTemp, MAX_PATH, &dwNr))
+ {
+ if (!lstrcmpW(p1W,sTemp)) /* icon is in the file */
+ strcpyW(psfi->szDisplayName, szFullPath);
+ else
+ strcpyW(psfi->szDisplayName, sTemp);
+
+ psfi->iIcon = SIC_GetIconIndex(psfi->szDisplayName, dwNr, 0);
+ if (psfi->iIcon == -1)
+ psfi->iIcon = 0;
+ }
+ }
}
}
Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/el-GR.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/el-GR.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/el-GR.rc (original)
+++ branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/el-GR.rc Mon Aug 13 06:02:40 2007
@@ -25,11 +25,11 @@
CAPTION "ÅãêáôÜóôáóç ôïõ ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Êáëùò Þëèáôå óôïí ïäçãü åãêáôÜóôáóçò ôïõ ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24
+ LTEXT "ÊáëùóÞñèáôå óôïí ïäçãü åãêáôÜóôáóçò ôïõ ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24
LTEXT "Áõôüò ï ïäçãüò åãêáèéóôÜ ôï ReactOS óôïí õðïëïãéóôÞ óáò. Ï ïäçãüò "\
- "èá ÷ñåéáóôåß íá ìáæÝøåé êÜðïéåò ðëçñïöïñßåò ó÷åôéêÜ ìå åóÜò êáé ôïí õðïëïãéóôÞ óáò "\
- "ãéá íá åãêáôáóôÞóåé ôï ReactOS óùóôÜ.", IDC_STATIC, 115, 40, 195, 100
- LTEXT "ÐáôÞóôå Åðüìåíï ãéá íá óõíå÷ßóåôå ìå ôçí åãêáôÜóôáóç.", IDC_STATIC, 115, 169, 195, 17
+ "÷ñåéÜæåôáé ðñþôá êÜðïéåò ðëçñïöïñßåò ãéá åóÜò êáé ãéá ôïí õðïëïãéóôÞ óáò "\
+ "ãéá íá ñõèìßóåé óùóôÜ ôï ReactOS.", IDC_STATIC, 115, 40, 195, 100
+ LTEXT "ÐáôÞóôå ôï êïõìðß Åðüìåíï ãéá íá óõíå÷Þóåé ç åãêáôÜóôáóç.", IDC_STATIC, 115, 169, 195, 17
END
@@ -38,16 +38,16 @@
CAPTION "ÅãêáôÜóôáóç ôïõ ReactOS"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- LTEXT "Ïé ðñïãñáììáôéóôÝò ôïõ ReactOS èá Þèåëáí íá áíáãíùñßóïõí ôá åðüìåíá Áíïé÷ôïý-Êþäéêá projects, "\
- "(ìÝñç ôùí ïðïßùí) ðïõ ÷ñçóéìïðïéÞèçêáí ãéá íá äçìéïõñãçèåß ôï ReactOS:",
- IDC_STATIC,15,7,286,19
- LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS |
+ LTEXT "Ïé õðåýèõíïé ãéá ôçí áíÜðôõîç ôïõ ReactOS èá Þèåëáí íá áíáãíùñßóïõí ôéò ðáñáêÜôù åñãáóßåò "\
+ "åëåýèåñïõ ëïãéóìéêïý, (ìÝñç ôùí ïðïßùí) ÷ñçóéìïðïéÞèçêáí ãéá ôçí áíÜðôõîç ôïõ ReactOS:",
+ IDC_STATIC,15,4,286,25
+ 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 "&ÅìöÜíéóç GPL...",IDC_VIEWGPL,251,110,50,19
- LTEXT "ÐáôÞóôå Åðüìåíï ãéá íá óõíå÷ßóåôå ìå ôçí åãêáôÜóôáóç.",IDC_STATIC,15,136,
+ LTEXT "Ôï ReactOS óáò Ý÷åé äïèåß óýìöùíá ìå ôçí Üäåéá GPL, Ýôóé áí èÝëåôå íá îáíá÷ñçóéìïðïéÞóåôå "\
+ "Þ íá åðáíáäéáíåßìåôå ìÝñç ôïõ Þ ïëüëêëçñï ôï Reactos, ðñÝðåé íá ôçñåßôå ôçí GPL.",
+ IDC_STATIC,15,110,227,24
+ PUSHBUTTON "&¢äåéá...",IDC_VIEWGPL,251,110,50,19
+ LTEXT "ÐáôÞóôå ôï êïõìðß Åðüìåíï ãéá íá óõíå÷Þóåôå.",IDC_STATIC,15,136,
195,17
END
@@ -57,9 +57,9 @@
CAPTION "ÅãêáôÜóôáóç ôïõ ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "ÐëçêôñïëïãÞóôå ôï ðëÞñåò üíïìÜ óáò êáé ôï üíïìá ôçò åôáéñåßáò Þ ôïõ ïñãáíéóìïý óáò.",
+ LTEXT "ÅéóÜãåôå ôï üíïìÜ óáò êáé ôï üíïìá ôçò åôáéñßáò Þ ïñãáíéóìïý óáò.",
IDC_STATIC, 54, 7, 242, 21
- LTEXT "¼íï&ìá:", IDC_STATIC, 54, 37, 44, 8
+ LTEXT "¼&íïìá:", IDC_STATIC, 54, 37, 44, 8
EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL
LTEXT "&Ïñãáíéóìüò:", IDC_STATIC, 54, 57, 44, 8
EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL
@@ -71,19 +71,19 @@
CAPTION "ÅãêáôÜóôáóç ôïõ ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "ÐëçêôñïëïãÞóôå Ýíá üíïìá ãéá ôïí õðïëïãéóôÞ óáò ðïõ íá åßíáé 63 ÷áñáêôÞñåò Þ ìéêñüôåñï. "\
- "Áí åßóôå óå êÜðïéï äßêôõï, ôï üíïìá ôïõ õðïëïãéóôÞ óáò èá ðñÝðåé íá åßíáé ìïíáäéêü.",
+ LTEXT "ÅéóÜãåôå ôï üíïìá ôïõ õðïëïãéóôÞ óáò ôï ïðïßï äåí ðñÝðåé íá îåðåñíÜ ôïõò 63 ÷áñáêôÞñåò. "\
+ "¢í ï õðïëïãéóôÞò áíçêåé óå êÜðïéï äßêôõï, ôï üíïìá ôïõ ðñÝðåé íá Ýéíáé ìïíáäéêü.",
IDC_STATIC, 54, 7, 250, 24
- LTEXT "¼íïìá &ÕðïëïãéóôÞ:", IDC_STATIC, 54, 38, 75, 8
+ LTEXT "&¼íïìá õðïëïãéóôÞ:", IDC_STATIC, 54, 38, 75, 8
EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE
- LTEXT "Ç åãêáôÜóôáóç èá äçìéïõñãÞóåé Ýíáí ëïãáñéáóìü ÷ñÞóôç óôïí õðïëïãéóôÞ óáò ìå ôï üíïìá Administrator. "\
- "Ìðïñåßôå íá ÷ñçóéìïðïéÞóåôå áõôüí ôïí ëïãáñéáóìü, áí èÝëåôå ðëÞñç Ýëåã÷ï ôïõ õðïëïãéóôÞ óáò.",
+ LTEXT "Ç åãêáôÜóôáóç èá äçìéïõñãÞóåé Ýíáí ëïãéáñéóìü äéá÷åéñéóôÞ óôïí õðïëïãéóôÞ óáò ìå ôï üíïìá Administrator. "\
+ "Ìå ôïí ëïãéáñéáóìü äéá÷åéñéóôÞ ìðïñåßôå íá áðïêôÞóåôå ôïí ðëÞñç Ýëåã÷ï ôïõ õðïëïãéóôÞ.",
IDC_STATIC, 54, 57, 250, 25
- LTEXT "ÐëçêôñïëïãÞóôå Ýíá Administrator óõíèçìáôéêü ðïõ íá åßíáé 14 ÷áñáêôÞñåò Þ ìéêñüôåñï.",
- IDC_STATIC, 54, 87, 250, 8
- LTEXT "&Óõíèçìáôéêü Administrator:", IDC_STATIC, 54, 104, 75, 8
+ LTEXT "ÅéóÜãåôå ðáñáêÜôù ôïí êùäéêü ðñüóâáóçò äéá÷åéñéóôÞ ï ïðïßïò äåí ðñÝðåé íá îåðåñíÜ ôïõò 14 ÷áñáêôÞñåò.",
+ IDC_STATIC, 54, 83, 250, 16
+ LTEXT "&Êùäéêüò ðñüóâáóçò:", IDC_STATIC, 54, 104, 75, 8
EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD
- LTEXT "Å&ðéâåâáßùóç Óõíèçìáôéêïý:", IDC_STATIC, 54, 123, 75, 8
+ LTEXT "&ÅðéâáéâÝùóç êùäéêïý:", IDC_STATIC, 54, 123, 75, 8
EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD
END
@@ -93,19 +93,19 @@
CAPTION "ÅãêáôÜóôáóç ôïõ ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Ç ãëþóóá óõóôÞìáôïò ðñÝðåé íá ôáéñéÜæåé ìå ôç ãëþóóá ôùí åöáñìïãþí "\
- "ðïõ èÝëåôå íá ÷ñçóéìïðïéÞóåôå. Ïé ôïðéêÝò ñõèìßóåéò ÷ñÞóôç åëÝã÷ïõí ðùò ïé áñéèìïß, "\
- "ôá íïìßóìáôá êáé ïé çìåñïìçíßåò åìöáíßæïíôáé.", IDC_STATIC, 53, 7, 253, 20
+ 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_STATIC, 53, 57, 184, 14
+ PUSHBUTTON "&ÐñïóáñìïãÞ...", IDC_CUSTOMLOCALE, 245, 57, 50, 14
+ LTEXT "Ç äéÜôáîç ðëçêôñïëïãßïõ ÝëÝã÷åé ôïõò ÷áñáêôÞñåò ðïõ èá åìöáíßæïíôáé êáèþò ðëçêôñïëïãåßôå.",
+ IDC_STATIC, 53, 86, 253, 16
LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
- LTEXT "Ãéá íá áëëÜîåôå ôç äéÜôáîç ðëçêôñïëïãßïõ, ðáôÞóôå Ðáñáìåôñïðïßçóçù.",
- IDC_STATIC, 53, 126, 184, 10
- PUSHBUTTON "Ð&áñáìåôñïðïßçóç...", IDC_CUSTOMLAYOUT, 245, 122, 55, 14
+ LTEXT "Ãéá íá áëëÜîåôå ôçí äéÜôáîç ôïõ ðëçêôñïëïãßïõ, ðáôÞóôå ôï êïõìðß ÐñïóáñìïãÞ.",
+ IDC_STATIC, 53, 122, 184, 14
+ PUSHBUTTON "Ð&ñïóáñìïãÞ...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14
END
@@ -114,16 +114,16 @@
CAPTION "ÅãêáôÜóôáóç ôïõ ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Çìåñïìçíßá êáé ¿ñá", IDC_STATIC, 53, 7, 253, 8
+ 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
+ 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 "Áõôüìáôç ñýèìéóç ñïëïãéïý ãéá &daylight saving áëëáãÝò",
- IDC_AUTODAYLIGHT, 53, 124, 201, 10
+ AUTOCHECKBOX "&Áõôüìáôç ñýèìéóç ìå ôçí áëëáãÞ èåñéíÞò þñáò",
+ IDC_AUTODAYLIGHT, 53, 114, 190, 20
END
@@ -141,24 +141,24 @@
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
+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
+ LTEXT "Áí õðÜñ÷åé êÜðïéï CD óå êáðïéá ìïíÜäá, âãÜëôå ôï. ÌåôÜ, ðáôÞóôå ôï êïõìðß "\
+ "ÔÝëïò êáé ï õðïëïãéóôÞò èá åðáíåêéíçèåß.", IDC_STATIC, 115, 160, 195, 25
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 |
+CAPTION "ÃåíéêÞ ¢äåéá ×ñÞóçò GNU"
+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
@@ -175,18 +175,18 @@
STRINGTABLE
BEGIN
- IDS_ACKTITLE "Åðéâåâáéþóåéò"
- IDS_ACKSUBTITLE "The shoulders ReactOS stands on and license information"
- IDS_OWNERTITLE "Ðáñáìåôñïðïßçóç ôïõ ëïãéóìéêïý óáò"
- IDS_OWNERSUBTITLE "Ç åãêáôÜóôáóç ÷ñçóéìïðïéåß áõôÝò ôéò ðëçñïöïñßåò óáò ãéá ôçí ðáñáìåôñïðïßçóç ôïõ ReactOS."
- IDS_COMPUTERTITLE "¼íïìá ÕðïëïãéóôÞ êáé Óõíèçìáôéêü Administrator"
- IDS_COMPUTERSUBTITLE "ÐñÝðåé íá äþóåôå Ýíá üíïìá êáé Ýíá óõíèçìáôéêü äéá÷åéñéóôÞ ãéá ôïí õðïëïãéóôÞ óáò."
- IDS_LOCALETITLE "ÔïðéêÝò Ñõèìßóåéò"
- IDS_LOCALESUBTITLE "Ìðïñåßôå íá ðáñáìåôñïðïéÞóåôå ôï ReactOS ãéá äéáöïñåôéêÝò ðåñéï÷Ýò êáé ãëþóóåò."
- IDS_DATETIMETITLE "Çìåñïìçíßá êáé ¿ñá"
- IDS_DATETIMESUBTITLE "Ïñéóìüò ôçò óùóôÞò çìåñïìçíßáò êáé þñáò ãéá ôïí õðïëïãéóôÞ óáò."
- IDS_PROCESSTITLE "Ãßíåôáé äÞëùóç ôùí óôïé÷åßùí"
- IDS_PROCESSSUBTITLE "Ðáñáêáëþ ðåñéìÝíåôå..."
+ 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 "Õðüôéôëïò"
END
STRINGTABLE
@@ -210,21 +210,21 @@
STRINGTABLE
BEGIN
- IDS_GAMES "Ðáé÷íßäéá"
- IDS_CMT_SOLITAIRE "ÐáóéÝíôæá"
- IDS_CMT_WINEMINE "ÍáñêáëéåõôÞò"
+ IDS_GAMES "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 "Timeout during registration"
+ 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
@@ -246,18 +246,18 @@
STRINGTABLE
BEGIN
- IDS_WZD_NAME "Ç åãêáôÜóôáóç äå ìðïñåß áí óõíå÷ßóåé ìÝ÷ñé íá äþóåôå ôï üíïìÜ óáò."
- IDS_WZD_SETCOMPUTERNAME "Ç åãêáôÜóôáóç áðÝôõ÷å íá ïñßóåé ôï üíïìá ôïõ õðïëïãéóôÞ."
- IDS_WZD_COMPUTERNAME "Ç åãêáôÜóôáóç äå ìðïñåß áí óõíå÷ßóåé ìÝ÷ñé íá äþóåôå ôï üíïìá ôïõ õðïëïãéóôÞ óáò."
- IDS_WZD_PASSWORDEMPTY "ÐñÝðåé íá äþóåôå Ýíá óõíèçìáôéêü !"
- IDS_WZD_PASSWORDMATCH "Ôá óõíèçìáôéêá´ðïõ äþóáôå äåí ôáéñéÜæïõí. Ðáñáêáëþ ðëçôñêïëïãÞóôå îáíÜ ôï åðéèõìçôü óõíèçìáôéêü."
- IDS_WZD_PASSWORDCHAR "Ôï óõíèçìáôéêü ðïõ äþóáôå ðåñéÝ÷åé ìç-Ýãêõñïõò ÷áñáêôÞñåò. Ðáñáêáëþ äþóôå êáèáñü óõíèçìáôéêü."
- IDS_WZD_LOCALTIME "Ç åãêáóôÜóç äå ìðüñåóå íá ïñßóåé ôçí ôïðéêÞ þñá."
-END
-
-STRINGTABLE
-BEGIN
- IDS_STATUS_INSTALL_DEV "Ãßíåôáé åãêáôÜóôáóç óõóêåõþí..."
+ IDS_WZD_NAME "Ãéá íá óõíå÷ßóåé ç åãêáôÜóôáóç ðñÝðåé íá åéóÜãåôå ôï üíïìÜ óáò."
+ IDS_WZD_SETCOMPUTERNAME "Ç åãêáôÜóôáóç áðÝôõ÷å íá ïñßóåé ôï üíïìá ôïõ õðïëïãéóôÞ óáò."
+ IDS_WZD_COMPUTERNAME "Ãéá íá óõíå÷ßóåé ç åãêáôÜóôáóç ðñÝðåé íá åéóÜãåôå ôï üíïìÜ ôïõ õðïëïãéóôÞ."
+ IDS_WZD_PASSWORDEMPTY "ÐñÝðåé íá åéóÜãåôå Ýíáí êùäéêü ðñüóâáóçò !"
+ IDS_WZD_PASSWORDMATCH "Ïé êùäéêïß ðñüóâáóçò ðïõ åéóáãÜãáôå äåí åßíáé ßäéïé. ÅéóÜãåôå îáíÜ ôïí êùäéêü ðñïóâáóçò."
+ IDS_WZD_PASSWORDCHAR "Ï êùäéêüò ðñüóâáóçò ðïõ åéóáãÜãáôå ðåñéÝ÷åé ìç Ýãêõñïõò ÷áñáêôÞñåò. Ðáñáêáëþ åéóÜãåôå Ýíáí Üëëï êùäéêü ðñüóâáóçò"
+ IDS_WZD_LOCALTIME "Ç åãêáôÜóôáóç áðÝôõ÷å íá ñõèìßóåé ôçí þñá ôïõ õðïëïãéóôÞ óáò."
+END
+
+STRINGTABLE
+BEGIN
+ IDS_STATUS_INSTALL_DEV "ÅãêáôÜóôáóç óõóêåõþí..."
END
/* EOF */
Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/fr-FR.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/fr-FR.rc (original)
+++ branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/fr-FR.rc Mon Aug 13 06:02:40 2007
@@ -185,8 +185,8 @@
IDS_LOCALESUBTITLE "Vous pouvez modifier ReactOS pour différentes régions et langues."
IDS_DATETIMETITLE "Date et Heure"
IDS_DATETIMESUBTITLE "Configurez la date et l'heure correcte pour votre ordinateur."
- IDS_PROCESSTITLE "Titre de page de processus"
- IDS_PROCESSSUBTITLE "Sous-titre de page de processus"
+ IDS_PROCESSTITLE "Enregistrement des composants"
+ IDS_PROCESSSUBTITLE "Veuillez patienter..."
END
STRINGTABLE
Modified: branches/ros-branch-0_3_3/reactos/dll/win32/user32/user32.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/win32/user32/user32.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/dll/win32/user32/user32.rc (original)
+++ branches/ros-branch-0_3_3/reactos/dll/win32/user32/user32.rc Mon Aug 13 06:02:40 2007
@@ -98,3 +98,4 @@
#include "Sk.rc"
#include "Sv.rc"
#include "Uk.rc"
+#include "Gr.rc"
Modified: branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_Pt.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_Pt.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_Pt.rc (original)
+++ branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_Pt.rc Mon Aug 13 06:02:40 2007
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_PORTUGAL
BEGIN
/* MMSYS errors */
Modified: branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_res.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_res.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_res.rc (original)
+++ branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_res.rc Mon Aug 13 06:02:40 2007
@@ -28,6 +28,7 @@
#include "winnls.h"
/* Add your language specific defines here */
+#include "winmm_Br.rc"
#include "winmm_Cs.rc"
#include "winmm_De.rc"
#include "winmm_En.rc"
Modified: branches/ros-branch-0_3_3/reactos/dll/win32/wldap32/wldap32_No.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/win32/wldap32/wldap32_No.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/dll/win32/wldap32/wldap32_No.rc (original)
+++ branches/ros-branch-0_3_3/reactos/dll/win32/wldap32/wldap32_No.rc Mon Aug 13 06:02:40 2007
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE
{
Modified: branches/ros-branch-0_3_3/reactos/include/reactos/wine/debug.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/include/reactos/wine/debug.h?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/include/reactos/wine/debug.h (original)
+++ branches/ros-branch-0_3_3/reactos/include/reactos/wine/debug.h Mon Aug 13 06:02:40 2007
@@ -101,6 +101,14 @@
#define WARN_ON(ch) 1
#endif
+#define WINE_WARN DPRINT
+#define WINE_WARN_(ch) DPRINT
+#ifdef NDEBUG
+#define WINE_WARN_ON(ch) 0
+#else
+#define WINE_WARN_ON(ch) 1
+#endif
+
#ifdef FIXME
#undef FIXME
#endif
Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/csrss/win32csr/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsystems/win32/csrss/win32csr/rsrc.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/subsystems/win32/csrss/win32csr/rsrc.rc (original)
+++ branches/ros-branch-0_3_3/reactos/subsystems/win32/csrss/win32csr/rsrc.rc Mon Aug 13 06:02:40 2007
@@ -12,3 +12,4 @@
#include "lang/pl-PL.rc"
#include "lang/uk-UA.rc"
#include "lang/ru-RU.rc"
+#include "lang/el-GR.rc"
Modified: branches/ros-branch-0_3_3/rosapps/downloader/translations/it.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/rosapps/downloader/translations/it.rc?rev=28309&r1=28308&r2=28309&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/rosapps/downloader/translations/it.rc (original)
+++ branches/ros-branch-0_3_3/rosapps/downloader/translations/it.rc Mon Aug 13 06:02:40 2007
@@ -17,7 +17,7 @@
IDS_WELCOME "Scegli una categoria a sinistra. Questa è la versione 1.0."
IDS_NO_APP_TITLE "Nessuna applicazione selezionata"
IDS_NO_APP "Scegli una Applicazione prima di premere il bottone di download, se serve assistenza clicca sul punto di domanda nell'angolo in alto a destra."
- IDS_UPDATE_TITLE "Aggiona"
+ IDS_UPDATE_TITLE "Aggiorna"
IDS_UPDATE "Funzione non ancora implementata."
IDS_HELP_TITLE "Aiuto"
IDS_HELP "Scegli una categoria a sinistra, poi scegli una applicazione e clicca il bottone download. Per aggiornare le informazioni sulla applicazione clicca il bottone accanto a quello di aiuto."
@@ -29,7 +29,7 @@
IDS_XMLERROR_1 "File xml non trovato !"
IDS_XMLERROR_2 "Impossibile trattare il contenuto del file xml !"
IDS_DOWNLOAD_ERROR "Download del file impossibile.\nVerifica la connessione a Internet."
- IDS_VERSION "Version: "
- IDS_LICENCE "Licence: "
- IDS_MAINTAINER "Maintainer: "
+ IDS_VERSION "Versione: "
+ IDS_LICENCE "Licenza: "
+ IDS_MAINTAINER "Manutentore: "
END
More information about the Ros-diffs
mailing list