diff options
Diffstat (limited to 'win')
-rw-r--r-- | win/rfb_win32/TrayIcon.h | 2 | ||||
-rw-r--r-- | win/vncconfig/vncconfig.cxx | 6 | ||||
-rw-r--r-- | win/vncconfig/vncconfig.rc | 28 | ||||
-rw-r--r-- | win/winvnc/QueryConnectDialog.cxx | 2 | ||||
-rw-r--r-- | win/winvnc/STrayIcon.cxx | 4 | ||||
-rw-r--r-- | win/winvnc/VNCServerWin32.cxx | 8 | ||||
-rw-r--r-- | win/winvnc/VNCServerWin32.h | 2 | ||||
-rw-r--r-- | win/winvnc/winvnc.cxx | 4 | ||||
-rw-r--r-- | win/winvnc/winvnc.rc | 32 | ||||
-rw-r--r-- | win/wm_hooks/wm_hooks.rc | 6 |
10 files changed, 47 insertions, 47 deletions
diff --git a/win/rfb_win32/TrayIcon.h b/win/rfb_win32/TrayIcon.h index 61d2c9ac..b4e75ea5 100644 --- a/win/rfb_win32/TrayIcon.h +++ b/win/rfb_win32/TrayIcon.h @@ -18,7 +18,7 @@ // -=- CView.h -// An instance of the CView class is created for each VNC Viewer connection. +// An instance of the CView class is created for each VNC viewer connection. #ifndef __RFB_WIN32_TRAY_ICON_H__ #define __RFB_WIN32_TRAY_ICON_H__ diff --git a/win/vncconfig/vncconfig.cxx b/win/vncconfig/vncconfig.cxx index 55f01d2e..b16ff1e4 100644 --- a/win/vncconfig/vncconfig.cxx +++ b/win/vncconfig/vncconfig.cxx @@ -129,7 +129,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE /*prev*/, char* /*cmdLine*/, int /* // Something weird happens on NT 4.0 SP5 but I can't reproduce it on other // NT 4.0 service pack revisions. if (e.err == ERROR_INVALID_PARAMETER) { - MsgBox(nullptr, "Windows reported an error trying to secure the VNC Server settings for this user. " + MsgBox(nullptr, "Windows reported an error trying to secure the VNC server settings for this user. " "Your settings may not be secure!", MB_ICONWARNING | MB_OK); } else if (e.err != ERROR_CALL_NOT_IMPLEMENTED && e.err != ERROR_NOT_LOGGED_ON) { @@ -158,9 +158,9 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE /*prev*/, char* /*cmdLine*/, int /* HICON icon = (HICON)LoadImage(inst, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 0, 0, LR_SHARED); // Create the PropertySheet handler - const char* propSheetTitle = "VNC Server Properties (Service-Mode)"; + const char* propSheetTitle = "VNC server properties (service-mode)"; if (configKey == HKEY_CURRENT_USER) - propSheetTitle = "VNC Server Properties (User-Mode)"; + propSheetTitle = "VNC server properties (user-mode)"; PropSheet sheet(inst, propSheetTitle, pages, icon); #ifdef _DEBUG diff --git a/win/vncconfig/vncconfig.rc b/win/vncconfig/vncconfig.rc index 4eccc604..ca188bcf 100644 --- a/win/vncconfig/vncconfig.rc +++ b/win/vncconfig/vncconfig.rc @@ -110,7 +110,7 @@ BEGIN LTEXT "Disconnect idle clients after (seconds):",IDC_STATIC,7, 25,138,15,SS_CENTERIMAGE EDITTEXT IDC_IDLE_TIMEOUT,150,25,61,15,ES_AUTOHSCROLL | ES_NUMBER - GROUPBOX "Access Control",IDC_STATIC,7,55,204,135 + GROUPBOX "Access control",IDC_STATIC,7,55,204,135 CONTROL "Only accept connections from the local machine", IDC_LOCALHOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15, 70,190,15 @@ -125,7 +125,7 @@ END IDD_HOOKING DIALOG DISCARDABLE 0, 0, 197, 101 STYLE DS_MODALFRAME | DS_CONTROL | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Capture Method" +CAPTION "Capture method" FONT 8, "MS Sans Serif" BEGIN CONTROL "Poll for changes to the desktop",IDC_USEPOLLING,"Button", @@ -141,12 +141,12 @@ END IDD_AUTH_VNC_PASSWD DIALOG DISCARDABLE 0, 0, 212, 70 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "VNC Server Password" +CAPTION "VNC server password" FONT 8, "MS Sans Serif" BEGIN - LTEXT "New Password:",IDC_STATIC,7,10,63,15 + LTEXT "New password:",IDC_STATIC,7,10,63,15 EDITTEXT IDC_PASSWORD1,75,10,130,15,ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "Confirm Password:",IDC_STATIC,7,30,63,14 + LTEXT "Confirm password:",IDC_STATIC,7,30,63,14 EDITTEXT IDC_PASSWORD2,75,30,130,14,ES_PASSWORD | ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,100,50,50,15 PUSHBUTTON "Cancel",IDCANCEL,155,50,50,15 @@ -157,14 +157,14 @@ STYLE DS_MODALFRAME | DS_CONTROL | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Legacy" FONT 8, "MS Sans Serif" BEGIN - PUSHBUTTON "&Import VNC 3.3 Settings",IDC_LEGACY_IMPORT,7,10,92,20 + PUSHBUTTON "&Import VNC 3.3 settings",IDC_LEGACY_IMPORT,7,10,92,20 CONTROL "Only use protocol version 3.3",IDC_PROTOCOL_3_3,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,35,152,15 END IDD_CONN_HOST DIALOG DISCARDABLE 0, 0, 225, 57 STYLE DS_SYSMODAL | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION -CAPTION "Specify Host IP Address Pattern" +CAPTION "Specify host IP address pattern" FONT 8, "MS Sans Serif" BEGIN EDITTEXT IDC_HOST_PATTERN,65,5,100,15,ES_AUTOHSCROLL @@ -221,7 +221,7 @@ END IDD_ABOUT DIALOG DISCARDABLE 0, 0, 300, 92 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About TigerVNC Config for Windows" +CAPTION "About TigerVNC config for Windows" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,245,70,47,15 @@ -459,17 +459,17 @@ BEGIN BLOCK "080904b0" BEGIN VALUE "Comments", "\0" - VALUE "CompanyName", "TigerVNC Project\0" + VALUE "CompanyName", "TigerVNC project\0" #ifdef WIN64 - VALUE "FileDescription", "TigerVNC Server Configuration Applet for Win64\0" - VALUE "ProductName", "TigerVNC Server Configuration Applet for Win64\0" + VALUE "FileDescription", "TigerVNC server configuration applet for Win64\0" + VALUE "ProductName", "TigerVNC server configuration applet for Win64\0" #else - VALUE "FileDescription", "TigerVNC Server Configuration Applet for Win32\0" - VALUE "ProductName", "TigerVNC Server Configuration Applet for Win32\0" + VALUE "FileDescription", "TigerVNC server configuration applet for Win32\0" + VALUE "ProductName", "TigerVNC server configuration applet for Win32\0" #endif VALUE "FileVersion", __RCVERSIONSTR VALUE "InternalName", "vncconfig\0" - VALUE "LegalCopyright", "Copyright (C) 1999-2024 TigerVNC Team and many others (see README.rst)\0" + VALUE "LegalCopyright", "Copyright (C) 1999-2024 TigerVNC team and many others (see README.rst)\0" VALUE "LegalTrademarks", "TigerVNC\0" VALUE "OriginalFilename", "vncconfig.exe\0" VALUE "PrivateBuild", "\0" diff --git a/win/winvnc/QueryConnectDialog.cxx b/win/winvnc/QueryConnectDialog.cxx index 24918b2a..26c3796e 100644 --- a/win/winvnc/QueryConnectDialog.cxx +++ b/win/winvnc/QueryConnectDialog.cxx @@ -34,7 +34,7 @@ using namespace winvnc; static LogWriter vlog("QueryConnectDialog"); static IntParameter timeout("QueryConnectTimeout", - "Number of seconds to show the Accept Connection dialog before " + "Number of seconds to show the Accept connection dialog before " "rejecting the connection", 10); diff --git a/win/winvnc/STrayIcon.cxx b/win/winvnc/STrayIcon.cxx index d703f47a..4fecf0c0 100644 --- a/win/winvnc/STrayIcon.cxx +++ b/win/winvnc/STrayIcon.cxx @@ -47,8 +47,8 @@ using namespace winvnc; static LogWriter vlog("STrayIcon"); -BoolParameter STrayIconThread::disableOptions("DisableOptions", "Disable the Options entry in the VNC Server tray menu.", false); -BoolParameter STrayIconThread::disableClose("DisableClose", "Disable the Close entry in the VNC Server tray menu.", false); +BoolParameter STrayIconThread::disableOptions("DisableOptions", "Disable the Options entry in the VNC server tray menu.", false); +BoolParameter STrayIconThread::disableClose("DisableClose", "Disable the Close entry in the VNC server tray menu.", false); // diff --git a/win/winvnc/VNCServerWin32.cxx b/win/winvnc/VNCServerWin32.cxx index c1545ab6..845ee854 100644 --- a/win/winvnc/VNCServerWin32.cxx +++ b/win/winvnc/VNCServerWin32.cxx @@ -112,9 +112,9 @@ void VNCServerWin32::processAddressChange() { return; // Tool-tip prefix depends on server mode - const char* prefix = "VNC Server (User):"; + const char* prefix = "VNC server (user):"; if (isServiceProcess()) - prefix = "VNC Server (Service):"; + prefix = "VNC server (service):"; // Fetch the list of addresses std::list<std::string> addrs; @@ -300,12 +300,12 @@ void VNCServerWin32::processEvent(HANDLE event_) { switch (command) { case DisconnectClients: - // Disconnect all currently active VNC Viewers + // Disconnect all currently active VNC viewers vncServer.closeClients((const char*)commandData); break; case AddClient: - // Make a reverse connection to a VNC Viewer + // Make a reverse connection to a VNC viewer sockMgr.addSocket((network::Socket*)commandData, &vncServer); break; case GetClientsInfo: diff --git a/win/winvnc/VNCServerWin32.h b/win/winvnc/VNCServerWin32.h index 493b3fa6..4fcc66d5 100644 --- a/win/winvnc/VNCServerWin32.h +++ b/win/winvnc/VNCServerWin32.h @@ -58,7 +58,7 @@ namespace winvnc { // THREAD-SAFE bool isServerInUse() const {return isDesktopStarted;} - // Connect out to the specified VNC Viewer + // Connect out to the specified VNC viewer // THREAD-SAFE bool addNewClient(const char* client); diff --git a/win/winvnc/winvnc.cxx b/win/winvnc/winvnc.cxx index ceee0c6f..e2abae19 100644 --- a/win/winvnc/winvnc.cxx +++ b/win/winvnc/winvnc.cxx @@ -16,7 +16,7 @@ * USA. */ -// -=- VNC Server 4.0 for Windows (WinVNC4) +// -=- VNC server 4.0 for Windows (WinVNC4) #ifdef HAVE_CONFIG_H #include <config.h> @@ -155,7 +155,7 @@ static void processParams(int argc, char** argv) { runServer = false; std::string result; DWORD state = rfb::win32::getServiceState(VNCServerService::Name); - result = format("The %s Service is in the %s state.", + result = format("The %s service is in the %s state.", VNCServerService::Name, rfb::win32::serviceStateName(state)); MsgBoxOrLog(result.c_str()); diff --git a/win/winvnc/winvnc.rc b/win/winvnc/winvnc.rc index 6fc65198..807114d0 100644 --- a/win/winvnc/winvnc.rc +++ b/win/winvnc/winvnc.rc @@ -76,9 +76,9 @@ BEGIN BLOCK "080904b0" BEGIN VALUE "Comments", "\0" - VALUE "CompanyName", "TigerVNC Project\0" - VALUE "FileDescription", "TigerVNC Server\0" - VALUE "ProductName", "TigerVNC Server\0" + VALUE "CompanyName", "TigerVNC project\0" + VALUE "FileDescription", "TigerVNC server\0" + VALUE "ProductName", "TigerVNC server\0" VALUE "FileVersion", __RCVERSIONSTR VALUE "InternalName", "winvnc\0" VALUE "LegalCopyright", "Copyright (C) 1999-2024 TigerVNC Team and many others (see README.rst)\0" @@ -119,14 +119,14 @@ IDR_TRAY MENU DISCARDABLE BEGIN POPUP "Tray Menu" BEGIN - MENUITEM "Control &Panel", ID_CONTR0L_PANEL + MENUITEM "Control &panel", ID_CONTR0L_PANEL MENUITEM SEPARATOR MENUITEM "&Options...", ID_OPTIONS - MENUITEM "Add &New Client...", ID_CONNECT - MENUITEM "&Disconnect Clients", ID_DISCONNECT - MENUITEM "D&isable New Clients", ID_DISABLE_NEW_CLIENTS + MENUITEM "Add &new client...", ID_CONNECT + MENUITEM "&Disconnect clients", ID_DISCONNECT + MENUITEM "D&isable new clients", ID_DISABLE_NEW_CLIENTS MENUITEM SEPARATOR - MENUITEM "&Close VNC Server", ID_CLOSE + MENUITEM "&Close VNC server", ID_CLOSE MENUITEM "&About...", ID_ABOUT END END @@ -140,7 +140,7 @@ END IDD_ABOUT DIALOG DISCARDABLE 0, 0, 300, 92 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About TigerVNC Server for Windows" +CAPTION "About TigerVNC server for Windows" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,245,70,47,15 @@ -156,7 +156,7 @@ END IDD_QUERY_CONNECT DIALOG DISCARDABLE 0, 0, 164, 93 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "VNC Server : Accept Connection?" +CAPTION "VNC server : Accept connection?" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "&Reject",IDCANCEL,105,72,52,14 @@ -173,7 +173,7 @@ END IDD_ADD_NEW_CLIENT DIALOG DISCARDABLE 0, 0, 177, 52 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "VNC Server : Add New Client" +CAPTION "VNC server : Add new client" FONT 8, "MS Sans Serif" BEGIN EDITTEXT IDC_HOST,80,10,90,15,ES_AUTOHSCROLL @@ -187,7 +187,7 @@ END IDD_CONTROL_PANEL DIALOG DISCARDABLE 0, 0, 267, 238 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | DS_CONTEXTHELP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Control Panel" +CAPTION "Control panel" FONT 8, "MS Sans Serif" BEGIN CONTROL "List1",IDC_LIST_CONNECTIONS,"SysListView32",LVS_REPORT | @@ -200,11 +200,11 @@ BEGIN PUSHBUTTON "View-only",IDC_VIEW_ONLY,13,121,111,14 PUSHBUTTON "Full control ",IDC_FULL_CONTROL,13,145,112,14 PUSHBUTTON "Stop updating",IDC_STOP_UPDATE,13,167,111,14 - PUSHBUTTON "Kill Clients",IDC_KILL_SEL_CLIENT,13,190,111,14 + PUSHBUTTON "Kill clients",IDC_KILL_SEL_CLIENT,13,190,111,14 PUSHBUTTON "Properties",IDC_PROPERTIES,144,121,111,14 - PUSHBUTTON "Add New Client",IDC_ADD_CLIENT,144,145,111,14 - PUSHBUTTON "Kill All Clients",IDC_KILL_ALL,144,167,111,14 - CONTROL "Disable New Clients",IDC_DISABLE_CLIENTS,"Button", + PUSHBUTTON "Add new client",IDC_ADD_CLIENT,144,145,111,14 + PUSHBUTTON "Kill all clients",IDC_KILL_ALL,144,167,111,14 + CONTROL "Disable new clients",IDC_DISABLE_CLIENTS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,144,191,111,13 PUSHBUTTON "Close",IDCANCEL,144,217,111,14 END diff --git a/win/wm_hooks/wm_hooks.rc b/win/wm_hooks/wm_hooks.rc index da7a9c45..ae56b314 100644 --- a/win/wm_hooks/wm_hooks.rc +++ b/win/wm_hooks/wm_hooks.rc @@ -72,9 +72,9 @@ BEGIN BLOCK "080904b0" BEGIN VALUE "Comments", "\0" - VALUE "CompanyName", "TigerVNC Project\0" - VALUE "FileDescription", "TigerVNC Server Hooking DLL\0" - VALUE "ProductName", "TigerVNC Server Hooking DLL\0" + VALUE "CompanyName", "TigerVNC project\0" + VALUE "FileDescription", "TigerVNC server hooking DLL\0" + VALUE "ProductName", "TigerVNC server hooking DLL\0" VALUE "FileVersion", __RCVERSIONSTR VALUE "InternalName", "\0" VALUE "LegalCopyright", "Copyright (C) 1999-2005 [many holders]\0" |