From 1134ae2669a01b0f8dc9f11d6d48b5cb4017de6f Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Sun, 23 Jul 2023 22:58:43 +0200 Subject: [PATCH] [0.4.9][DXDIAG] Backport trivial translation fixes 2023-07-23 0.4.15-dev-5770-g 793e9f20ef84873705a782165e5c446b133e19e7 [DXDIAG] Fix text truncation on button for french fr-FR.rc CORE-18853 0.4.15-dev-5768-g 29d0deef1384e7050098ee2f04900009550ec5d0 [DXDIAG] Fix text truncation german de-DE.rc CORE-18853 (#5137) 0.4.15-dev-5533-g 5b8886de2647ee7a5e96d59449c3924341f3d61c [DXDIAG] Fix Portuguese (pt-BR) translation (#4953) and some other translation improvements + EOL-whitespace, and a few _countof() in system.c taken from 0.4.10-dev'ing master dxdiag.exe GCC8.4.0dbg 406.016 0.4.14 dxdiag.exe GCC4.7.2dbg 375.296 -> 375.296 0.4.13 dxdiag.exe GCC4.7.2dbg 375.296 -> 374.784 0.4.12 dxdiag.exe GCC4.7.2dbg 376.320 -> 375.808 0.4.11 dxdiag.exe GCC4.7.2dbg 376.320 -> 375.808 0.4.10 dxdiag.exe GCC4.7.2dbg 376.320 -> 375.808 0.4.9 dxdiag.exe GCC4.7.2dbg 371.712 -> 371.200 0.4.8 dxdiag.exe GCC4.7.2dbg 371.712 -> 371.200 0.4.7 dxdiag.exe GCC4.7.2dbg 371.200 -> 371.200 --- base/applications/dxdiag/ddtest.c | 4 +-- base/applications/dxdiag/display.c | 4 +-- base/applications/dxdiag/dxdiag.c | 16 ++++----- base/applications/dxdiag/lang/de-DE.rc | 2 +- base/applications/dxdiag/lang/es-ES.rc | 8 ++--- base/applications/dxdiag/lang/fr-FR.rc | 4 +-- base/applications/dxdiag/lang/pt-BR.rc | 2 +- base/applications/dxdiag/lang/ro-RO.rc | 2 +- base/applications/dxdiag/lang/sq-AL.rc | 2 +- base/applications/dxdiag/lang/tr-TR.rc | 48 +++++++++++++------------- base/applications/dxdiag/lang/zh-CN.rc | 6 ++-- base/applications/dxdiag/lang/zh-TW.rc | 6 ++-- base/applications/dxdiag/network.c | 4 +-- base/applications/dxdiag/sound.c | 4 +-- base/applications/dxdiag/system.c | 44 +++++++++++------------ 15 files changed, 76 insertions(+), 80 deletions(-) diff --git a/base/applications/dxdiag/ddtest.c b/base/applications/dxdiag/ddtest.c index ea112a78d9a..7b63805b738 100644 --- a/base/applications/dxdiag/ddtest.c +++ b/base/applications/dxdiag/ddtest.c @@ -14,7 +14,7 @@ BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen); VOID DDRedrawFrame(LPDIRECTDRAWSURFACE lpDDSurface); VOID DDUpdateFrame(LPDIRECTDRAWSURFACE lpDDPrimarySurface ,LPDIRECTDRAWSURFACE lpDDBackBuffer, BOOL Fullscreen, INT *posX, INT *posY, INT *gainX, INT *gainY, RECT *rectDD); -#define TEST_DURATION 10000 +#define TEST_DURATION 10000 #define DD_TEST_WIDTH 640 #define DD_TEST_HEIGHT 480 #define DD_TEST_STEP 5 @@ -295,7 +295,7 @@ BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen){ { if (msg.message == WM_TIMER) { - if(msg.wParam == TimerID) + if(msg.wParam == TimerID) { break; } diff --git a/base/applications/dxdiag/display.c b/base/applications/dxdiag/display.c index 779772f4052..eae055589f4 100644 --- a/base/applications/dxdiag/display.c +++ b/base/applications/dxdiag/display.c @@ -188,7 +188,7 @@ DisplayPageSetDeviceDetails(HWND * hDlgCtrls, LPCGUID classGUID, LPGUID * device SendMessageW(hDlgCtrls[1], WM_SETTEXT, 0, (LPARAM)szText); /* FIXME - * we currently enumerate only the first adapter + * we currently enumerate only the first adapter */ EnumerateDrivers(&hDlgCtrls[2], hInfo, &InfoData); break; @@ -367,7 +367,7 @@ DisplayPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { RECT rect; PDXDIAG_CONTEXT pContext = (PDXDIAG_CONTEXT)GetWindowLongPtr(hDlg, DWLP_USER); - switch (message) + switch (message) { case WM_INITDIALOG: { diff --git a/base/applications/dxdiag/dxdiag.c b/base/applications/dxdiag/dxdiag.c index 096b276da8c..eaeace91e1f 100644 --- a/base/applications/dxdiag/dxdiag.c +++ b/base/applications/dxdiag/dxdiag.c @@ -18,7 +18,7 @@ HWND hTabCtrlWnd; // http://www.catch22.net/software/winspy // Copyright (c) 2002 by J Brown // - + // // Copied from uxtheme.h // If you have this new header, then delete these and @@ -29,7 +29,7 @@ HWND hTabCtrlWnd; #define ETDT_USETABTEXTURE 0x00000004 #define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE) -// +// typedef HRESULT (WINAPI * ETDTProc) (HWND, DWORD); // @@ -44,7 +44,7 @@ BOOL EnableDialogTheme(HWND hwnd) if(hUXTheme) { - fnEnableThemeDialogTexture = + fnEnableThemeDialogTexture = (ETDTProc)GetProcAddress(hUXTheme, "EnableThemeDialogTexture"); if(fnEnableThemeDialogTexture) @@ -249,9 +249,9 @@ DxDiagWndProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam) CurSel++; /* enable/disable next button */ - EnableWindow(GetDlgItem(hwndDlg, IDC_BUTTON_NEXT), + EnableWindow(GetDlgItem(hwndDlg, IDC_BUTTON_NEXT), (CurSel != TabCtrl_GetItemCount(hTabCtrlWnd) - 1)); - + /* switch to next tab */ SendMessageW(hTabCtrlWnd, TCM_SETCURSEL, CurSel, 0L); @@ -280,7 +280,7 @@ DxDiagWndProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam) INT CurSel = TabCtrl_GetCurSel(hTabCtrlWnd); /* enable/disable next button */ - EnableWindow(GetDlgItem(hwndDlg, IDC_BUTTON_NEXT), + EnableWindow(GetDlgItem(hwndDlg, IDC_BUTTON_NEXT), (CurSel != TabCtrl_GetItemCount(hTabCtrlWnd) - 1)); TabCtrl_OnSelChange(pContext); @@ -310,8 +310,8 @@ int APIENTRY wWinMain(HINSTANCE hInstance, InitCommonControlsEx(&InitControls); hInst = hInstance; - + DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, DxDiagWndProc); - + return 0; } diff --git a/base/applications/dxdiag/lang/de-DE.rc b/base/applications/dxdiag/lang/de-DE.rc index c2f084a9674..e5b46e54aad 100644 --- a/base/applications/dxdiag/lang/de-DE.rc +++ b/base/applications/dxdiag/lang/de-DE.rc @@ -182,7 +182,7 @@ IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Informationen, die Sie suchen immer noch nicht gefunden? Hier sind einige zusätzliche Dinge, die Sie tun können:", IDC_STATIC, 5, 0, 300, 10 + LTEXT "Information noch nicht gefunden? Hier sind einige zusätzliche Dinge, die Sie tun können:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "Systeminformationen...", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED LTEXT "Zeigt zusätzliche Systeminformationen an", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Außer Kraft setzen...", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED diff --git a/base/applications/dxdiag/lang/es-ES.rc b/base/applications/dxdiag/lang/es-ES.rc index 8411eaa3682..daf17ab181a 100644 --- a/base/applications/dxdiag/lang/es-ES.rc +++ b/base/applications/dxdiag/lang/es-ES.rc @@ -172,7 +172,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Proveedores de servicios DirectPlay registrados", IDC_STATIC, 5, 0, 452, 75 CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55 - GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55 + GROUPBOX "Registro forzoso de Aplicaciones DirectPlay", IDC_STATIC, 5, 77, 452, 55 GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35 PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED @@ -248,9 +248,9 @@ BEGIN IDS_DMUSIC_DESC "Description" IDS_DMUSIC_TYPE "Type" IDS_DMUSIC_KERNEL "Kernel Mode" - IDS_DMUSIC_IO "In/Out" - IDS_DMUSIC_DLS "Supports DLS" - IDS_DMUSIC_EXT "External" + IDS_DMUSIC_IO "E/S" + IDS_DMUSIC_DLS "Soporta DLS" + IDS_DMUSIC_EXT "Externo" IDS_DMUSIC_PORT "Default Port" IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices.\nDo you wish to continue?\n" END diff --git a/base/applications/dxdiag/lang/fr-FR.rc b/base/applications/dxdiag/lang/fr-FR.rc index 65d9fcbba76..53133493ee5 100644 --- a/base/applications/dxdiag/lang/fr-FR.rc +++ b/base/applications/dxdiag/lang/fr-FR.rc @@ -182,10 +182,10 @@ IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 + LTEXT "Vous ne trouvez pas les informations que vous cherchez ? Voici ce que vous pouvez faire :", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 - PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED + PUSHBUTTON "Remplacer...", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END diff --git a/base/applications/dxdiag/lang/pt-BR.rc b/base/applications/dxdiag/lang/pt-BR.rc index 61dc00e61c1..328b5795b76 100644 --- a/base/applications/dxdiag/lang/pt-BR.rc +++ b/base/applications/dxdiag/lang/pt-BR.rc @@ -24,7 +24,7 @@ BEGIN GROUPBOX "Informações do sistema", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT LTEXT "Data/hora atual:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT LTEXT "Nome do computador:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT - LTEXT "Sistema pperacional:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT + LTEXT "Sistema operacional:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT LTEXT "Idioma:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT LTEXT "Fabricante do sistema:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT LTEXT "Modelo do sistema:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT diff --git a/base/applications/dxdiag/lang/ro-RO.rc b/base/applications/dxdiag/lang/ro-RO.rc index c3aa62482a1..ad28db600b0 100644 --- a/base/applications/dxdiag/lang/ro-RO.rc +++ b/base/applications/dxdiag/lang/ro-RO.rc @@ -1,7 +1,7 @@ /* * FILE: base/applications/dxdiag/lang/ro-RO.rc * ReactOS Project (https://reactos.org) - * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot md) + * TRANSLATOR: Stefan Fulea */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL diff --git a/base/applications/dxdiag/lang/sq-AL.rc b/base/applications/dxdiag/lang/sq-AL.rc index 6e738efeff6..7ad7c4f0a27 100644 --- a/base/applications/dxdiag/lang/sq-AL.rc +++ b/base/applications/dxdiag/lang/sq-AL.rc @@ -1,4 +1,4 @@ -/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com) +/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com) * DATE OF TR: 29-11-2013 */ diff --git a/base/applications/dxdiag/lang/tr-TR.rc b/base/applications/dxdiag/lang/tr-TR.rc index 74a6aee51b6..a6743f2daf7 100644 --- a/base/applications/dxdiag/lang/tr-TR.rc +++ b/base/applications/dxdiag/lang/tr-TR.rc @@ -10,7 +10,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 PUSHBUTTON "&Yardım", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&Sonraki Bölüm", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "S&onraki Sayfa", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Tüm Bilgileri Sakla...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Çıkış", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -19,8 +19,8 @@ IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Bu araç, dizgenizdeki yüklü ReactX bileşenleri ve sürücüleri üzerine ayrıntılı bilgi raporlar.", IDC_STATIC, 5, 0, 443, 17 - LTEXT "ReactX ile ilgili bir sorunla karşılaştıysanız ve onun ne olduğunu biliyorsanız o zaman yukarıda uygun sekmeyi tıklayınız. Yoksa diziyle tüm bölümlere gitmek için aşağıdaki ""Sonraki Bölüm"" düğmesine tıklayabilirsiniz.", IDC_STATIC, 5, 15, 443, 25 + LTEXT "Bu araç, sisteminizde yüklü ReactX bileşenleri ve sürücüleri hakkında ayrıntılı bilgi verir.", IDC_STATIC, 5, 0, 443, 17 + LTEXT "ReactX ile bir sorun yaşıyorsanız ve bunun ne olduğunu biliyorsanız, yukarıdaki uygun sekmeye tıklayın. Değilse, her sayfayı sırayla ziyaret etmek için aşağıdaki ""Sonraki Sayfa"" düğmesine tıklayabilirsiniz.", IDC_STATIC, 5, 15, 443, 25 GROUPBOX "Dizge Bilgisi", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT LTEXT "Geçerli Zaman:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT LTEXT "Bilgisayar Adı:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT @@ -58,7 +58,7 @@ BEGIN RTEXT "DAC Türü:", IDC_STATIC, 20, 40, 70, 10 RTEXT "Yaklaşık Toplam Bellek:", IDC_STATIC, 20, 50, 70, 10 RTEXT "Şimdiki Görüntü Kipi:", IDC_STATIC, 20, 60, 70, 10 - RTEXT "Göstergeç:", IDC_STATIC, 20, 70, 70, 10 + RTEXT "Ekran:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -70,7 +70,7 @@ BEGIN RTEXT "Ana Sürücü:", IDC_STATIC, 275, 10, 55, 10 RTEXT "Sürüm:", IDC_STATIC, 275, 20, 55, 10 RTEXT "Zaman:", IDC_STATIC, 275, 30, 55, 10 - RTEXT "WHQL İmleği:", IDC_STATIC, 275, 40, 55, 10 + RTEXT "WHQL Logolu:", IDC_STATIC, 275, 40, 55, 10 RTEXT "Mini VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT "VDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "DDI Sürümü:", IDC_STATIC, 275, 70, 55, 10 @@ -81,7 +81,7 @@ BEGIN EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - GROUPBOX "ReactX Husûsiyetleri", IDC_STATIC, 5, 97, 452, 70 + GROUPBOX "ReactX Özellikleri", IDC_STATIC, 5, 97, 452, 70 RTEXT "ReactDraw İvmesi:", IDC_STATIC, 15, 115, 110, 12 RTEXT "React3D İvmesi:", IDC_STATIC, 15, 130, 110, 12 RTEXT "AGP Doku İvmesi:", IDC_STATIC, 15, 145, 110, 12 @@ -118,8 +118,8 @@ BEGIN RTEXT "Ad:", IDC_STATIC, 275, 10, 55, 10 RTEXT "Sürüm:", IDC_STATIC, 275, 20, 55, 10 RTEXT "Zaman:", IDC_STATIC, 275, 30, 55, 10 - RTEXT "WHQL İmleği:", IDC_STATIC, 275, 40, 55, 10 - RTEXT "Başka Kütükler:", IDC_STATIC, 275, 50, 55, 10 + RTEXT "WHQL Logolu:", IDC_STATIC, 275, 40, 55, 10 + RTEXT "Başka Dosyalar:", IDC_STATIC, 275, 50, 55, 10 RTEXT "Sağlayıcı:", IDC_STATIC, 275, 60, 55, 10 EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -127,7 +127,7 @@ BEGIN EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - GROUPBOX "ReactX Husûsiyetleri", IDC_STATIC, 5, 97, 452, 70 + GROUPBOX "ReactX Özellikleri", IDC_STATIC, 5, 97, 452, 70 CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17 RTEXT "Donanım Ses\nİvme Düzeyi:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED PUSHBUTTON "&ReactSound'u Sına", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED @@ -139,10 +139,10 @@ IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - RTEXT "Umûmî MIDI DLS Derlemi:", IDC_STATIC, 0, 0, 100, 10 + RTEXT "Genel MIDI DLS Derlemi:", IDC_STATIC, 0, 0, 100, 10 EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - GROUPBOX "Mûsiki Girişleri", IDC_STATIC, 5, 10, 452, 85 - GROUPBOX "ReactX Husûsiyetleri", IDC_STATIC, 5, 97, 452, 70 + GROUPBOX "Müzik Girişleri", IDC_STATIC, 5, 10, 452, 85 + GROUPBOX "ReactX Özellikleri", IDC_STATIC, 5, 97, 452, 70 LTEXT "Ön Tanımlı Giriş İvmesi:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Edilgin", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED @@ -173,7 +173,7 @@ BEGIN GROUPBOX "Kayıtlı ReactPlay Hizmet Sağlayıcıları", IDC_STATIC, 5, 0, 452, 75 CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55 GROUPBOX "Lobi Oluşturulabilir Kayıtlı ReactPlay Uygulamaları", IDC_STATIC, 5, 77, 452, 55 - GROUPBOX "ReactX Husûsiyetleri", IDC_STATIC, 5, 133, 452, 35 + GROUPBOX "ReactX Özellikleri", IDC_STATIC, 5, 133, 452, 35 PUSHBUTTON "ReactPlay Ses Seçenekleri", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED PUSHBUTTON "ReactPlay'i Sına", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED GROUPBOX "Notlar", IDC_STATIC, 5, 170, 452, 50 @@ -184,7 +184,7 @@ IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Aradığınız bilgiyi şimdi bile bulamadınız mı? Burada yapabileceğiniz birtakım ek şeyler var:", IDC_STATIC, 5, 0, 300, 10 + LTEXT "Aradığınız bilgiyi hala bulamıyor musunuz? İşte yapabileceğiniz bazı ek şeyler:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "Dizge Bilgisi", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED LTEXT "Ek dizge bilgisini görüntüler.", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Yenileme Hızı'nı Geçersiz Kıl", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED @@ -197,7 +197,7 @@ BEGIN IDS_SYSTEM_DIALOG "Dizge" IDS_DISPLAY_DIALOG "Görüntü" IDS_SOUND_DIALOG "Ses" - IDS_MUSIC_DIALOG "Mûsiki" + IDS_MUSIC_DIALOG "Müzik" IDS_INPUT_DIALOG "Giriş" IDS_NETWORK_DIALOG "Ağ" IDS_HELP_DIALOG "Yardım" @@ -214,28 +214,28 @@ BEGIN IDS_DEVICE_CONTROLLER "Denetleyici Kimliği" IDS_DEVICE_MANUFACTURER "Üretici Kimliği" IDS_DEVICE_PRODUCT "Ürün Kimliği" - IDS_DEVICE_FORCEFEEDBACK "Güç Dönütlü Sürücü" + IDS_DEVICE_FORCEFEEDBACK "Güç Tepkili Sürücü" IDS_NOT_APPLICABLE "Uygulanamaz" IDS_OPTION_YES "Evet" IDS_DIRECTPLAY_COL_NAME1 "Ad" IDS_DIRECTPLAY_COL_NAME2 "Kayıt" - IDS_DIRECTPLAY_COL_NAME3 "Kütük" + IDS_DIRECTPLAY_COL_NAME3 "Dosya" IDS_DIRECTPLAY_COL_NAME4 "Sürüm" - IDS_DIRECTPLAY8_MODEMSP "ReactPlay8 Çevirge Hizmeti Sağlayıcısı" + IDS_DIRECTPLAY8_MODEMSP "ReactPlay8 Modem Hizmeti Sağlayıcısı" IDS_DIRECTPLAY8_SERIALSP "ReactPlay8 Dizilik Hizmeti Sağlayıcısı" IDS_DIRECTPLAY8_IPXSP "ReactPlay8 IPX Hizmeti Sağlayıcısı" IDS_DIRECTPLAY8_TCPSP "ReactPlay8 TCP/IP Hizmeti Sağlayıcısı" - IDS_DIRECTPLAY_TCPCONN "ReactPlay için Umûmî Ağ TCP/IP Bağlantısı" + IDS_DIRECTPLAY_TCPCONN "ReactPlay için Genel Ağ TCP/IP Bağlantısı" IDS_DIRECTPLAY_IPXCONN "ReactPlay için IPX Bağlantısı" - IDS_DIRECTPLAY_MODEMCONN "ReactPlay için Çeivrge Bağlantısı" - IDS_DIRECTPLAY_SERIALCONN "ReactPlay için Dizilik Bağlantı" + IDS_DIRECTPLAY_MODEMCONN "ReactPlay için Modem Bağlantısı" + IDS_DIRECTPLAY_SERIALCONN "ReactPlay için Seri Bağlantı" IDS_REG_SUCCESS "Tamam" - IDS_REG_FAIL "Yanlışlık" + IDS_REG_FAIL "Hata" IDS_DDTEST_ERROR "ReactDraw işleme sınaması başarısız oldu. Daha çok bilgi için lütfen notlara bakınız." IDS_DDTEST_DESCRIPTION "Bu, ReactDraw arayüz sınamasını başlatacak. Sürdürmek ister misiniz?" IDS_DDPRIMARY_DESCRIPTION "Bu sınama, ReactDraw'ı ana yüzeye çizmek için kullanacak. Ak ve kara dikdörtgenler çizilecektir. Sürdürmek ister misiniz?" IDS_DDPRIMARY_RESULT "Ak ve kara dikdörtgenler gördünüz mü?" - IDS_DDOFFSCREEN_DESCRIPTION "Bu sınama, ReactDraw'ı görüntülük dışı arabelleğe çizmek için kullanacak. Devinen bir ak dikdörtgen çizilecektir. Sürdürmek ister misiniz?" + IDS_DDOFFSCREEN_DESCRIPTION "Bu sınama, ReactDraw'ı ekran dışı arabelleğe çizmek için kullanacak. Devinen bir ak dikdörtgen çizilecektir. Sürdürmek ister misiniz?" IDS_DDOFFSCREEN_RESULT "Devinen bir ak dikdörtgen gördünüz mü?" IDS_DDFULLSCREEN_DESCRIPTION "Bu sınama, ReactDraw'ı tüm görüntülükte çizmek için kullanacak. Devinen bir ak dikdörtgen göreceksiniz. Sürdürmek ister misiniz?" IDS_DDFULLSCREEN_RESULT "Tüm görüntülükte devinen bir ak dikdörtgen gördünüz mü?" @@ -251,6 +251,6 @@ BEGIN IDS_DMUSIC_IO "Giriş/Çıkış" IDS_DMUSIC_DLS "DLS'yi Destekler" IDS_DMUSIC_EXT "Dış" - IDS_DMUSIC_PORT "Ön Tanımlı Giriş" + IDS_DMUSIC_PORT "Varsayılan Giriş" IDS_DDDISABLE_MSG "Bu, tüm görüntü aygıtlarında ReactDraw için tüm donanım ivmelerini edilginleştirecektir.\nSürdürmek ister misiniz?\n" END diff --git a/base/applications/dxdiag/lang/zh-CN.rc b/base/applications/dxdiag/lang/zh-CN.rc index 4579a868f9b..d8778e9067b 100644 --- a/base/applications/dxdiag/lang/zh-CN.rc +++ b/base/applications/dxdiag/lang/zh-CN.rc @@ -1,8 +1,6 @@ /* - * PROJECT: ReactOS ReactX-Diagnostic program + * PROJECT: ReactX Diagnosis Tool * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/dxdiag/lang/zh-CN.rc - * PURPOSE: Chinese (Simplified) Language File for ReactX-Diagnostic program * TRANSLATOR: Elton Chung * Li Keqing */ @@ -27,7 +25,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "宋体" BEGIN LTEXT "该工具报告有关 ReactX 组件和安装在系统上的驱动程序的详细信息。", IDC_STATIC, 5, 0, 443, 17 - LTEXT "如果您知道是哪个部分引起的错误，请单击上面适当的选项卡。否则，您可以使用下面的“下一页”按钮按顺序查阅每一页。 ", IDC_STATIC, 5, 15, 443, 25 + LTEXT "如果您知道是哪个部分引起的错误，请单击上面适当的选项卡。否则，您可以使用下面的“下一页”按钮按顺序查阅每一页。", IDC_STATIC, 5, 15, 443, 25 GROUPBOX "系统信息", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT LTEXT "当前日期/时间：", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT LTEXT "计算机名：", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT diff --git a/base/applications/dxdiag/lang/zh-TW.rc b/base/applications/dxdiag/lang/zh-TW.rc index 93d9926ad29..36b62491b55 100644 --- a/base/applications/dxdiag/lang/zh-TW.rc +++ b/base/applications/dxdiag/lang/zh-TW.rc @@ -1,8 +1,6 @@ /* - * PROJECT: ReactOS ReactX-Diagnostic program + * PROJECT: ReactX Diagnosis Tool * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/dxdiag/lang/zh-TW.rc - * PURPOSE: Chinese (Traditional) Language File for ReactX-Diagnostic program * TRANSLATOR: Elton Chung */ @@ -190,7 +188,7 @@ IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "新細明體" BEGIN - LTEXT "仍然找不到你要找的資訊嗎？ 下面是一些其他的事情你可以做：", IDC_STATIC, 5, 0, 300, 10 + LTEXT "仍然找不到您要找的資訊嗎？以下是您可以進行的其他操作：", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "系統資訊", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED LTEXT "顯示附加的系統資訊", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "刷新率重寫", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED diff --git a/base/applications/dxdiag/network.c b/base/applications/dxdiag/network.c index 7122b7b6beb..440ebe30619 100644 --- a/base/applications/dxdiag/network.c +++ b/base/applications/dxdiag/network.c @@ -43,7 +43,7 @@ static DIRECTPLAY_GUID DirectPlay8SP[] = } }; -static DIRECTPLAY_GUID DirectPlaySP[] = +static DIRECTPLAY_GUID DirectPlaySP[] = { { L"{36E95EE0-8577-11cf-960C-0080C7534E82}", @@ -232,7 +232,7 @@ EnumerateServiceProviders(HKEY hKey, HWND hDlgCtrl, DIRECTPLAY_GUID * PreDefProv Item.iItem = ListView_GetItemCount(hDlgCtrl); /* FIXME - * on Windows Vista we need to use RegLoadMUIString which is not available for older systems + * on Windows Vista we need to use RegLoadMUIString which is not available for older systems */ if (!GetRegValue(hKey, szName, L"Friendly Name", REG_SZ, szResult, sizeof(szResult))) if (!GetRegValue(hKey, szName, L"DescriptionW", REG_SZ, szResult, sizeof(szResult))) diff --git a/base/applications/dxdiag/sound.c b/base/applications/dxdiag/sound.c index ff5cc487dc3..d3540c505e0 100644 --- a/base/applications/dxdiag/sound.c +++ b/base/applications/dxdiag/sound.c @@ -167,7 +167,7 @@ SetDeviceDetails(HWND hwndDlg, LPCGUID classGUID, LPCWSTR lpcstrDescription) SendDlgItemMessageW(hwndDlg, IDC_STATIC_ADAPTER_PROVIDER, WM_SETTEXT, 0, (LPARAM)szText); /* FIXME - * we currently enumerate only the first adapter + * we currently enumerate only the first adapter */ hDlgCtrls[0] = GetDlgItem(hwndDlg, IDC_STATIC_DSOUND_DRIVER); hDlgCtrls[1] = GetDlgItem(hwndDlg, IDC_STATIC_DSOUND_VERSION); @@ -282,7 +282,7 @@ void InitializeDirectSoundPage(PDXDIAG_CONTEXT pContext) INT_PTR CALLBACK SoundPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - switch (message) + switch (message) { case WM_INITDIALOG: { diff --git a/base/applications/dxdiag/system.c b/base/applications/dxdiag/system.c index b6686a515d6..ef9045c13d1 100644 --- a/base/applications/dxdiag/system.c +++ b/base/applications/dxdiag/system.c @@ -40,7 +40,7 @@ GetRegValue(HKEY hBaseKey, LPWSTR SubKey, LPWSTR ValueName, DWORD Type, LPWSTR R } -static +static BOOL GetDirectXVersion(WCHAR * szBuffer) { @@ -109,7 +109,7 @@ VOID GetSystemCPU(WCHAR *szBuffer) the program is not running in WOW64. */ fnIsWow64Process = (ISWOW64PROC)GetProcAddress( GetModuleHandleW(L"kernel32"), "IsWow64Process"); - + if (fnIsWow64Process != NULL) fnIsWow64Process(GetCurrentProcess(), &isWow64); @@ -169,7 +169,7 @@ InitializeSystemPage(HWND hwndDlg) /* set date/time */ szTime[0] = L'\0'; - Length = GetDateFormat(LOCALE_SYSTEM_DEFAULT, DATE_LONGDATE, NULL, NULL, szTime, sizeof(szTime) / sizeof(WCHAR)); + Length = GetDateFormat(LOCALE_SYSTEM_DEFAULT, DATE_LONGDATE, NULL, NULL, szTime, _countof(szTime)); if (Length) { szTime[Length-1] = L','; @@ -181,14 +181,14 @@ InitializeSystemPage(HWND hwndDlg) /* set computer name */ szTime[0] = L'\0'; - Length = sizeof(szTime) / sizeof(WCHAR); + Length = _countof(szTime); if (GetComputerNameW(szTime, &Length)) SendDlgItemMessageW(hwndDlg, IDC_STATIC_COMPUTER, WM_SETTEXT, 0, (LPARAM)szTime); /* set product name */ if (GetRegValue(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", L"ProductName", REG_SZ, szOSName, sizeof(szOSName))) { - if (LoadStringW(hInst, IDS_OS_VERSION, szFormat, sizeof(szFormat) / sizeof(WCHAR))) + if (LoadStringW(hInst, IDS_OS_VERSION, szFormat, _countof(szFormat))) { WCHAR szCpuName[50]; @@ -199,14 +199,14 @@ InitializeSystemPage(HWND hwndDlg) if (GetVersionEx(&VersionInfo)) { - szTime[(sizeof(szTime) / sizeof(WCHAR))-1] = L'\0'; + szTime[_countof(szTime)-1] = L'\0'; wsprintfW(szTime, szFormat, szOSName, szCpuName, VersionInfo.dwMajorVersion, VersionInfo.dwMinorVersion, VersionInfo.dwBuildNumber); SendDlgItemMessageW(hwndDlg, IDC_STATIC_OS, WM_SETTEXT, 0, (LPARAM)szTime); } else { /* If the version of the OS cannot be retrieved for some reason, then just give the OS Name and Architecture */ - szTime[(sizeof(szTime) / sizeof(WCHAR))-1] = L'\0'; + szTime[_countof(szTime)-1] = L'\0'; wsprintfW(szTime, L"%s %s", szOSName, szCpuName); SendDlgItemMessageW(hwndDlg, IDC_STATIC_OS, WM_SETTEXT, 0, (LPARAM)szTime); } @@ -214,15 +214,15 @@ InitializeSystemPage(HWND hwndDlg) } else { - if (LoadStringW(hInst, IDS_VERSION_UNKNOWN, szTime, sizeof(szTime) / sizeof(WCHAR))) + if (LoadStringW(hInst, IDS_VERSION_UNKNOWN, szTime, _countof(szTime))) { - szTime[(sizeof(szTime) / sizeof(WCHAR))-1] = L'\0'; + szTime[_countof(szTime)-1] = L'\0'; SendDlgItemMessage(hwndDlg, IDC_STATIC_VERSION, WM_SETTEXT, 0, (LPARAM)szTime); } } /* FIXME set product language/local language */ - if (GetLocaleInfo(LOCALE_SYSTEM_DEFAULT,LOCALE_SLANGUAGE , szTime, sizeof(szTime) / sizeof(WCHAR))) + if (GetLocaleInfo(LOCALE_SYSTEM_DEFAULT, LOCALE_SLANGUAGE, szTime, _countof(szTime))) SendDlgItemMessageW(hwndDlg, IDC_STATIC_LANG, WM_SETTEXT, 0, (LPARAM)szTime); /* set system manufacturer */ @@ -245,20 +245,20 @@ InitializeSystemPage(HWND hwndDlg) if (GetRegValue(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\BIOS", L"BIOSVendor", REG_SZ, szTime, sizeof(szTime))) { DWORD Index; - DWORD StrLength = (sizeof(szTime) / sizeof(WCHAR)); + DWORD StrLength = _countof(szTime); Index = wcslen(szTime); StrLength -= Index; if (GetRegValue(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\BIOS", L"BIOSReleaseDate", REG_SZ, &szTime[Index], StrLength)) { - if (Index + StrLength > (sizeof(szTime)/sizeof(WCHAR))- 15) + if (Index + StrLength > _countof(szTime) - 15) { //FIXME retrieve BiosMajorRelease, BiosMinorRelease //StrLength = wcslen(&szTime[Index]); //szTime[Index+StrLength] = L' '; //wcscpy(&szTime[Index+StrLength], L"Ver: "); //FIXME NON-NLS - //szTime[(sizeof(szTime)/sizeof(WCHAR))-1] = L'\0'; + //szTime[_countof(szTime)-1] = L'\0'; } SendDlgItemMessageW(hwndDlg, IDC_STATIC_BIOS, WM_SETTEXT, 0, (LPARAM)szTime); } @@ -270,11 +270,11 @@ InitializeSystemPage(HWND hwndDlg) szFormat[0] = L'\0'; GetSystemInfo(&SysInfo); if (SysInfo.dwNumberOfProcessors > 1) - LoadStringW(hInst, IDS_FORMAT_MPPROC, szFormat, sizeof(szFormat) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_FORMAT_MPPROC, szFormat, _countof(szFormat)); else - LoadStringW(hInst, IDS_FORMAT_UNIPROC, szFormat, sizeof(szFormat) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_FORMAT_UNIPROC, szFormat, _countof(szFormat)); - szFormat[(sizeof(szFormat)/sizeof(WCHAR))-1] = L'\0'; + szFormat[_countof(szFormat)-1] = L'\0'; wsprintfW(szTime, szFormat, szDesc, SysInfo.dwNumberOfProcessors); SendDlgItemMessageW(hwndDlg, IDC_STATIC_PROC, WM_SETTEXT, 0, (LPARAM)szTime); } @@ -284,21 +284,21 @@ InitializeSystemPage(HWND hwndDlg) mem.dwLength = sizeof(mem); if (GlobalMemoryStatusEx(&mem)) { - if (LoadStringW(hInst, IDS_FORMAT_MB, szFormat, sizeof(szFormat) / sizeof(WCHAR))) + if (LoadStringW(hInst, IDS_FORMAT_MB, szFormat, _countof(szFormat))) { /* set total mem string */ - szFormat[(sizeof(szFormat) / sizeof(WCHAR))-1] = L'\0'; + szFormat[_countof(szFormat)-1] = L'\0'; wsprintfW(szTime, szFormat, (mem.ullTotalPhys/1048576)); SendDlgItemMessageW(hwndDlg, IDC_STATIC_MEM, WM_SETTEXT, 0, (LPARAM)szTime); } - if (LoadStringW(hInst, IDS_FORMAT_SWAP, szFormat, sizeof(szFormat) / sizeof(WCHAR))) + if (LoadStringW(hInst, IDS_FORMAT_SWAP, szFormat, _countof(szFormat))) { /* set swap string */ AvailableBytes = (mem.ullTotalPageFile-mem.ullTotalPhys)/1048576; UsedBytes = (mem.ullTotalPageFile-mem.ullAvailPageFile)/1048576; - szFormat[(sizeof(szFormat) / sizeof(WCHAR))-1] = L'\0'; + szFormat[_countof(szFormat)-1] = L'\0'; wsprintfW(szTime, szFormat, (UsedBytes), (AvailableBytes)); SendDlgItemMessageW(hwndDlg, IDC_STATIC_SWAP, WM_SETTEXT, 0, (LPARAM)szTime); } @@ -311,9 +311,9 @@ InitializeSystemPage(HWND hwndDlg) } else { - if (LoadStringW(hInst, IDS_VERSION_UNKNOWN, szTime, sizeof(szTime) / sizeof(WCHAR))) + if (LoadStringW(hInst, IDS_VERSION_UNKNOWN, szTime, _countof(szTime))) { - szTime[(sizeof(szTime) / sizeof(WCHAR))-1] = L'\0'; + szTime[_countof(szTime)-1] = L'\0'; SendDlgItemMessage(hwndDlg, IDC_STATIC_VERSION, WM_SETTEXT, 0, (LPARAM)szTime); } }