From 260a3e0db5d09be0cb732d1a7ce8e758079e0c11 Mon Sep 17 00:00:00 2001 From: "Madeleine (ThinLinc team)" Date: Mon, 4 Nov 2024 13:28:48 +0100 Subject: [PATCH] Standardize on sentence case in titles The reason for this is to keep a consistency through out the project. --- BUILDING.txt | 54 +++++++++---------- README.rst | 10 ++-- common/rfb/TightEncoder.cxx | 2 +- common/rfb/TightJPEGEncoder.cxx | 2 +- common/rfb/VNCServerST.cxx | 2 +- java/cmake/SignJar.cmake | 2 +- java/com/tigervnc/vncviewer/LICENCE.TXT | 2 +- java/com/tigervnc/vncviewer/MANIFEST.MF | 2 +- .../com/tigervnc/vncviewer/OptionsDialog.java | 2 +- java/com/tigervnc/vncviewer/Parameters.java | 2 +- java/com/tigervnc/vncviewer/README | 8 +-- java/com/tigervnc/vncviewer/ServerDialog.java | 2 +- java/com/tigervnc/vncviewer/VncViewer.java | 8 +-- release/Info.plist.in | 8 +-- release/makemacapp.in | 2 +- release/winvnc.iss.in | 42 +++++++-------- unix/vncconfig/QueryConnectDialog.cxx | 2 +- unix/vncserver/vncserver.in | 2 +- unix/vncserver/vncserver.users | 2 +- unix/x0vncserver/XDesktop.cxx | 2 +- unix/x0vncserver/x0vncserver.cxx | 2 +- unix/x0vncserver/x0vncserver.man | 6 +-- unix/xserver/hw/vnc/XserverDesktop.cc | 2 +- unix/xserver/hw/vnc/Xvnc.man | 2 +- unix/xserver/hw/vnc/vncModule.c | 2 +- vncviewer/OptionsDialog.cxx | 2 +- vncviewer/ServerDialog.cxx | 4 +- .../org.tigervnc.vncviewer.metainfo.xml.in | 6 +-- vncviewer/vncviewer.cxx | 10 ++-- vncviewer/vncviewer.desktop.in.in | 4 +- vncviewer/vncviewer.man | 2 +- vncviewer/vncviewer.rc.in | 6 +-- win/rfb_win32/TrayIcon.h | 2 +- win/vncconfig/vncconfig.cxx | 6 +-- win/vncconfig/vncconfig.rc | 28 +++++----- win/winvnc/QueryConnectDialog.cxx | 2 +- win/winvnc/STrayIcon.cxx | 4 +- win/winvnc/VNCServerWin32.cxx | 8 +-- win/winvnc/VNCServerWin32.h | 2 +- win/winvnc/winvnc.cxx | 4 +- win/winvnc/winvnc.rc | 32 +++++------ win/wm_hooks/wm_hooks.rc | 6 +-- 42 files changed, 150 insertions(+), 150 deletions(-) diff --git a/BUILDING.txt b/BUILDING.txt index 8067bd90..7e73d72e 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -4,7 +4,7 @@ ================================ -Build Requirements (All Systems) +Build requirements (all systems) ================================ -- CMake (http://www.cmake.org) v3.10 or later @@ -36,7 +36,7 @@ Development kits for the following packages: ========================= -Build Requirements (Unix) +Build requirements (Unix) ========================= -- Non-Mac platforms: @@ -59,7 +59,7 @@ Build Requirements (Unix) * libpwquality ============================ -Build Requirements (Windows) +Build requirements (Windows) ============================ -- MinGW or MinGW-w64 @@ -75,16 +75,16 @@ Build Requirements (Windows) ========================= -Build Requirements (Java) +Build requirements (Java) ========================= -- Sun/Oracle JDK 1.7 or later or OpenJDK 7 or later --- See "Building Java Support" below. +-- See "Building Java support" below. ================== -Out-of-Tree Builds +Out-of-tree builds ================== Binary objects, libraries, and executables are generated in the same directory @@ -102,10 +102,10 @@ Building TigerVNC ================= -Building the TigerVNC Viewer on Unix/Mac Systems +Building the TigerVNC viewer on Unix/Mac systems ------------------------------------------------ -The following procedure will build the TigerVNC Viewer on Linux and Unix +The following procedure will build the TigerVNC viewer on Linux and Unix systems. cd {build_directory} @@ -113,10 +113,10 @@ systems. make -Building the TigerVNC Server on Unix/Linux Systems +Building the TigerVNC server on Unix/Linux systems -------------------------------------------------- -Building the TigerVNC Server (Xvnc) is a bit trickier. Xvnc is typically built +Building the TigerVNC server (Xvnc) is a bit trickier. Xvnc is typically built to use the X11 shared libraries provided with the system. The procedure for this is system-specific, since it requires specifying such things as font directories, but the general outline is as follows (this procedure assumes @@ -162,7 +162,7 @@ that the viewer has already been built, per above.) (NOTE: Use absolute paths for source_directory and build_directory) -Building the Windows TigerVNC Viewer with MinGW +Building the Windows TigerVNC viewer with MinGW ----------------------------------------------- If building the Windows version of TigerVNC on a Windows build system, use @@ -176,13 +176,13 @@ If cross-compiling on a Unix/Linux system, then see the "Build Recipes" section below. -Debug Build +Debug build ----------- Add "-DCMAKE_BUILD_TYPE=Debug" to the CMake command line. -Portable (semi-static) Build +Portable (semi-static) build ---------------------------- TigerVNC can under favourble circumstances be built in a way that allows @@ -199,7 +199,7 @@ specific system. ===================== -Building Java Support +Building Java support ===================== TigerVNC includes a Java version of the TigerVNC Viewer, which can be used on @@ -221,10 +221,10 @@ tools are needed to sign the JAR file, which is necessary to enable certain functionality (such as clipboard transfers) when the Java viewer is used as an applet. -If the Java viewer is built along with the Windows TigerVNC Server (WinVNC), +If the Java viewer is built along with the Windows TigerVNC server (WinVNC), then the build system will embed the Java viewer into WinVNC4.exe so that it will automatically be served up using WinVNC's built-in HTTP server. -Similarly, if the Java viewer is built along with the Unix TigerVNC Server +Similarly, if the Java viewer is built along with the Unix TigerVNC server (Xvnc), then the build system will include the Java viewer in the server tarball. @@ -252,7 +252,7 @@ or ":file " (see the jarsigner documentation for more info): ====================================== -Building TLS Support +Building TLS support ====================================== TLS requires GnuTLS, which is supplied with most Linux distributions and @@ -272,7 +272,7 @@ libgnutls located under /usr/local. ====================================== -Building Native Language Support (NLS) +Building native language support (NLS) ====================================== NLS requires gettext, which is supplied with most Linux distributions and @@ -314,7 +314,7 @@ c:\Program Files\TigerVNC on Windows and /usr/local on Unix. ========================= -Creating Release Packages +Creating release packages ========================= The following commands can be used to create various types of release packages: @@ -325,16 +325,16 @@ Unix make tarball - Create a binary tarball containing the TigerVNC Viewer + Create a binary tarball containing the TigerVNC viewer make servertarball - Create a binary tarball containing both the TigerVNC Server and Viewer + Create a binary tarball containing both the TigerVNC server and viewer make dmg Create Macintosh disk image file that contains an application bundle of the - TigerVNC Viewer + TigerVNC viewer Windows @@ -347,11 +347,11 @@ make installer ============= -Build Recipes +Build recipes ============= -MinGW Build on Cygwin +MinGW build on Cygwin --------------------- cd {build_directory} @@ -367,7 +367,7 @@ other Cygwin DLL's. The mingw64-x86_64-gcc-core and mingw64-x86_64-gcc-g++ packages (and their dependencies) must be installed. -MinGW-w64 Build on Windows +MinGW-w64 build on Windows -------------------------- This produces a build of TigerVNC using the "native" MinGW-w64 toolchain @@ -384,7 +384,7 @@ This produces a build of TigerVNC using the "native" MinGW-w64 toolchain make -MinGW Build on Linux +MinGW build on Linux -------------------- cd {build_directory} @@ -399,7 +399,7 @@ MinGW Build on Linux =============================== -Distribution-Specific Packaging +Distribution-specific packaging =============================== Configuration for building packages for current versions of RHEL/CentOS diff --git a/README.rst b/README.rst index 1209478b..e57536d5 100644 --- a/README.rst +++ b/README.rst @@ -56,26 +56,26 @@ All versions of TigerVNC contain the following programs: VNC server can be running on a Windows or a Unix/Linux machine. -Windows-Specific +Windows-specific ================ The Windows version of TigerVNC contains the following programs: -* winvnc - the TigerVNC Server for Windows. winvnc allows a Windows desktop to +* winvnc - the TigerVNC server for Windows. winvnc allows a Windows desktop to be accessed remotely using a VNC viewer. WARNING: winvnc is currently unmaintained and and may not function correctly. -winvnc may not work if the Fast User Switching or Remote Desktop features are +winvnc may not work if the Fast user switching or Remote desktop features are in use. -Unix/Linux-Specific (not Mac) +Unix/Linux-specific (not Mac) ============================= The Unix/Linux version of TigerVNC contains the following programs: -* Xvnc - the TigerVNC Server for Unix. Xvnc is both a VNC server and an X +* Xvnc - the TigerVNC server for Unix. Xvnc is both a VNC server and an X server with a "virtual" framebuffer. You should normally use the vncserver service to start Xvnc. diff --git a/common/rfb/TightEncoder.cxx b/common/rfb/TightEncoder.cxx index 169b74f7..3d46aaa3 100644 --- a/common/rfb/TightEncoder.cxx +++ b/common/rfb/TightEncoder.cxx @@ -43,7 +43,7 @@ struct TightConf { // settings for each of 10 compression levels (0..9). // // NOTE: The parameters used in this encoder are the result of painstaking -// research by The VirtualGL Project using RFB session captures from a variety +// research by The VirtualGL project using RFB session captures from a variety // of both 2D and 3D applications. See http://www.VirtualGL.org for the full // reports. diff --git a/common/rfb/TightJPEGEncoder.cxx b/common/rfb/TightJPEGEncoder.cxx index de8fd77f..527dc618 100644 --- a/common/rfb/TightJPEGEncoder.cxx +++ b/common/rfb/TightJPEGEncoder.cxx @@ -37,7 +37,7 @@ struct TightJPEGConfiguration { }; // NOTE: The JPEG quality and subsampling levels below were obtained -// experimentally by the VirtualGL Project. They represent the approximate +// experimentally by the VirtualGL project. They represent the approximate // average compression ratios listed below, as measured across the set of // every 10th frame in the SPECviewperf 9 benchmark suite. // diff --git a/common/rfb/VNCServerST.cxx b/common/rfb/VNCServerST.cxx index 66b05fae..feda8a83 100644 --- a/common/rfb/VNCServerST.cxx +++ b/common/rfb/VNCServerST.cxx @@ -17,7 +17,7 @@ * USA. */ -// -=- Single-Threaded VNC Server implementation +// -=- Single-Threaded VNC server implementation // Note about how sockets get closed: diff --git a/java/cmake/SignJar.cmake b/java/cmake/SignJar.cmake index cfca1ba2..dc8f1f2a 100644 --- a/java/cmake/SignJar.cmake +++ b/java/cmake/SignJar.cmake @@ -31,7 +31,7 @@ else() execute_process(COMMAND ${KEYTOOL} -genkey -alias TigerVNC -keystore tigervnc.keystore -keyalg RSA -storepass tigervnc -keypass tigervnc -validity 7300 - -dname "CN=TigerVNC, OU=Software Development, O=The TigerVNC Project, L=Austin, S=Texas, C=US" + -dname "CN=TigerVNC, OU=Software development, O=The TigerVNC project, L=Austin, S=Texas, C=US" RESULT_VARIABLE RESULT OUTPUT_VARIABLE OUTPUT ERROR_VARIABLE ERROR) if(NOT RESULT EQUAL 0) message(FATAL_ERROR "${KEYTOOL} failed:\n${ERROR}") diff --git a/java/com/tigervnc/vncviewer/LICENCE.TXT b/java/com/tigervnc/vncviewer/LICENCE.TXT index ae3b5319..8aadde97 100644 --- a/java/com/tigervnc/vncviewer/LICENCE.TXT +++ b/java/com/tigervnc/vncviewer/LICENCE.TXT @@ -279,7 +279,7 @@ POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Programs + Appendix: How to apply these terms to your new programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it diff --git a/java/com/tigervnc/vncviewer/MANIFEST.MF b/java/com/tigervnc/vncviewer/MANIFEST.MF index 4ba75f6a..9e282655 100644 --- a/java/com/tigervnc/vncviewer/MANIFEST.MF +++ b/java/com/tigervnc/vncviewer/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 Main-Class: com.tigervnc.vncviewer.VncViewer -Application-Name: TigerVNC Viewer +Application-Name: TigerVNC viewer Permissions: all-permissions Codebase: * diff --git a/java/com/tigervnc/vncviewer/OptionsDialog.java b/java/com/tigervnc/vncviewer/OptionsDialog.java index 2fbd9d9c..927fdf21 100644 --- a/java/com/tigervnc/vncviewer/OptionsDialog.java +++ b/java/com/tigervnc/vncviewer/OptionsDialog.java @@ -175,7 +175,7 @@ class OptionsDialog extends Dialog { @SuppressWarnings({"rawtypes","unchecked"}) public OptionsDialog() { super(true); - setTitle("VNC Viewer Options"); + setTitle("VNC viewer options"); setResizable(false); getContentPane().setLayout( diff --git a/java/com/tigervnc/vncviewer/Parameters.java b/java/com/tigervnc/vncviewer/Parameters.java index 8c8465cb..dd2f1c3e 100644 --- a/java/com/tigervnc/vncviewer/Parameters.java +++ b/java/com/tigervnc/vncviewer/Parameters.java @@ -192,7 +192,7 @@ public class Parameters { "specified from the point of view of the gateway machine, "+ "e.g. \"localhost\" denotes the gateway, "+ "not the machine on which the viewer was launched. "+ - "See the System Properties section below for "+ + "See the System properties section below for "+ "information on configuring the -Via option.", ""); public static BoolParameter tunnel diff --git a/java/com/tigervnc/vncviewer/README b/java/com/tigervnc/vncviewer/README index 5d5ebf90..404b8eb9 100644 --- a/java/com/tigervnc/vncviewer/README +++ b/java/com/tigervnc/vncviewer/README @@ -1,5 +1,5 @@ -TigerVNC Java Viewer +TigerVNC Java viewer ==================== This distribution is based on the standard VNC source and includes new @@ -27,9 +27,9 @@ available. Installation ============ -The TigerVNC Java Viewer requires installation of either a JRE (Java +The TigerVNC Java viewer requires installation of either a JRE (Java Runtime Environment) or a JDK (Java Development Kit). If VncViewer.jar is -in the current directory, then the TigerVNC Java Viewer can be launched +in the current directory, then the TigerVNC Java viewer can be launched with the following command line: java -jar VncViewer.jar [parameters] @@ -41,7 +41,7 @@ optional parameters supported by VncViewer. Parameters ========== -The TigerVNC Java Viewer accepts a number of optional parameters, allowing you +The TigerVNC Java viewer accepts a number of optional parameters, allowing you to customize its behavior. Example: java -jar VncViewer.jar Port=5901 ScalingFactor=50 diff --git a/java/com/tigervnc/vncviewer/ServerDialog.java b/java/com/tigervnc/vncviewer/ServerDialog.java index 5f75fd3d..01f91db2 100644 --- a/java/com/tigervnc/vncviewer/ServerDialog.java +++ b/java/com/tigervnc/vncviewer/ServerDialog.java @@ -47,7 +47,7 @@ class ServerDialog extends Dialog implements Runnable { super(true); this.vncServerName = vncServerName; setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); - setTitle("VNC Viewer: Connection Details"); + setTitle("VNC viewer: Connection details"); setResizable(false); addWindowListener(new WindowAdapter() { public void windowClosing(WindowEvent e) { diff --git a/java/com/tigervnc/vncviewer/VncViewer.java b/java/com/tigervnc/vncviewer/VncViewer.java index 067f4eff..4e4364cb 100644 --- a/java/com/tigervnc/vncviewer/VncViewer.java +++ b/java/com/tigervnc/vncviewer/VncViewer.java @@ -61,7 +61,7 @@ import static com.tigervnc.vncviewer.Parameters.*; public class VncViewer implements Runnable { public static final String aboutText = - new String("TigerVNC Java Viewer v%s (%s)%n"+ + new String("TigerVNC Java viewer v%s (%s)%n"+ "Built on %s at %s%n"+ "Copyright (C) 1999-2024 TigerVNC Team and many others (see README.rst)%n"+ "See https://www.tigervnc.org for information on TigerVNC."); @@ -237,7 +237,7 @@ public class VncViewer implements Runnable { Configuration.listParams(79, 14); String propertiesString = ("\n"+ -"System Properties (adapted from the TurboVNC vncviewer man page)\n"+ +"System properties (adapted from the TurboVNC vncviewer man page)\n"+ " When started with the -via option, vncviewer reads the VNC_VIA_CMD\n"+ " System property, expands patterns beginning with the \"%\" character,\n"+ " and uses the resulting command line to establish the secure tunnel\n"+ @@ -359,7 +359,7 @@ public class VncViewer implements Runnable { JOptionPane op = new JOptionPane(msg, JOptionPane.INFORMATION_MESSAGE, JOptionPane.DEFAULT_OPTION, VncViewer.logoIcon, options); - JDialog dlg = op.createDialog(parent, "About TigerVNC Viewer for Java"); + JDialog dlg = op.createDialog(parent, "About TigerVNC viewer for Java"); dlg.setIconImage(VncViewer.frameIcon); dlg.setAlwaysOnTop(true); dlg.setVisible(true); @@ -378,7 +378,7 @@ public class VncViewer implements Runnable { void reportException(java.lang.Exception e) { String title, msg = e.getMessage(); int msgType = JOptionPane.ERROR_MESSAGE; - title = "TigerVNC Viewer : Error"; + title = "TigerVNC viewer : Error"; e.printStackTrace(); JOptionPane.showMessageDialog(null, msg, title, msgType); } diff --git a/release/Info.plist.in b/release/Info.plist.in index 8a88beac..c7505dd1 100644 --- a/release/Info.plist.in +++ b/release/Info.plist.in @@ -5,9 +5,9 @@ CFBundleDevelopmentRegion English CFBundleDisplayName - TigerVNC Viewer + TigerVNC viewer CFBundleExecutable - TigerVNC Viewer + TigerVNC viewer NSHighResolutionCapable CFBundleGetInfoString @@ -19,9 +19,9 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - TigerVNC Viewer @VERSION@ + TigerVNC viewer @VERSION@ CFBundleName - TigerVNC Viewer + TigerVNC viewer CFBundlePackageType APPL CFBundleShortVersionString diff --git a/release/makemacapp.in b/release/makemacapp.in index 7f195eda..10eac996 100644 --- a/release/makemacapp.in +++ b/release/makemacapp.in @@ -37,7 +37,7 @@ fi umask 022 TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX` -APPROOT="$TMPDIR/dmg/TigerVNC Viewer $VERSION.app" +APPROOT="$TMPDIR/dmg/TigerVNC viewer $VERSION.app" mkdir -p "$APPROOT/Contents/MacOS" mkdir -p "$APPROOT/Contents/Resources" diff --git a/release/winvnc.iss.in b/release/winvnc.iss.in index 48ab32bb..773aa175 100644 --- a/release/winvnc.iss.in +++ b/release/winvnc.iss.in @@ -2,13 +2,13 @@ #ifdef WIN64 ArchitecturesInstallIn64BitMode=x64 #endif -AppName=TigerVNC Server -AppVerName=TigerVNC Server v@VERSION@ (@BUILD@) +AppName=TigerVNC server +AppVerName=TigerVNC server v@VERSION@ (@BUILD@) AppVersion=@VERSION@ AppPublisher=TigerVNC project AppPublisherURL=https://tigervnc.org -DefaultDirName={pf}\TigerVNC Server -DefaultGroupName=TigerVNC Server +DefaultDirName={pf}\TigerVNC server +DefaultGroupName=TigerVNC server LicenseFile=@CMAKE_SOURCE_DIR@\LICENCE.TXT [Dirs] @@ -25,20 +25,20 @@ Source: "@CMAKE_SOURCE_DIR@\LICENCE.TXT"; DestDir: "{app}"; Flags: ignoreversion [Icons] -Name: "{group}\VNC Server (User-Mode)\Run VNC Server"; FileName: "{app}\winvnc4.exe"; Parameters: "-noconsole"; -Name: "{group}\VNC Server (User-Mode)\Configure VNC Server"; FileName: "{app}\vncconfig.exe"; Parameters: "-user"; - -Name: "{group}\VNC Server (Service-Mode)\Configure VNC Service"; FileName: "{app}\vncconfig.exe"; Parameters: "-noconsole -service"; -Name: "{group}\VNC Server (Service-Mode)\Register VNC Service"; FileName: "{app}\winvnc4.exe"; Parameters: "-register"; -Name: "{group}\VNC Server (Service-Mode)\Unregister VNC Service"; FileName: "{app}\winvnc4.exe"; Parameters: "-unregister"; -Name: "{group}\VNC Server (Service-Mode)\Start VNC Service"; FileName: "{app}\winvnc4.exe"; Parameters: "-noconsole -start"; -Name: "{group}\VNC Server (Service-Mode)\Stop VNC Service"; FileName: "{app}\winvnc4.exe"; Parameters: "-noconsole -stop"; +Name: "{group}\VNC server (User-Mode)\Run VNC server"; FileName: "{app}\winvnc4.exe"; Parameters: "-noconsole"; +Name: "{group}\VNC server (User-Mode)\Configure VNC server"; FileName: "{app}\vncconfig.exe"; Parameters: "-user"; + +Name: "{group}\VNC server (Service-Mode)\Configure VNC service"; FileName: "{app}\vncconfig.exe"; Parameters: "-noconsole -service"; +Name: "{group}\VNC server (Service-Mode)\Register VNC service"; FileName: "{app}\winvnc4.exe"; Parameters: "-register"; +Name: "{group}\VNC server (Service-Mode)\Unregister VNC service"; FileName: "{app}\winvnc4.exe"; Parameters: "-unregister"; +Name: "{group}\VNC server (Service-Mode)\Start VNC service"; FileName: "{app}\winvnc4.exe"; Parameters: "-noconsole -start"; +Name: "{group}\VNC server (Service-Mode)\Stop VNC service"; FileName: "{app}\winvnc4.exe"; Parameters: "-noconsole -stop"; Name: "{group}\License"; FileName: "write.exe"; Parameters: "LICENCE.TXT"; WorkingDir: "{app}"; Flags: "useapppaths" -Name: "{group}\Read Me"; FileName: "write.exe"; Parameters: "README.rst"; WorkingDir: "{app}"; Flags: "useapppaths" -Name: "{group}\Uninstall TigerVNC Server"; FileName: "{uninstallexe}"; WorkingDir: "{app}"; +Name: "{group}\Read me"; FileName: "write.exe"; Parameters: "README.rst"; WorkingDir: "{app}"; Flags: "useapppaths" +Name: "{group}\Uninstall TigerVNC server"; FileName: "{uninstallexe}"; WorkingDir: "{app}"; [Tasks] -Name: installservice; Description: "&Register new TigerVNC Server as a system service"; GroupDescription: "Server configuration:"; +Name: installservice; Description: "&Register new TigerVNC server as a system service"; GroupDescription: "Server configuration:"; Name: startservice; Description: "&Start or restart TigerVNC service"; GroupDescription: "Server configuration:"; [Run] @@ -106,7 +106,7 @@ var function InitializeSetup: Boolean; begin GetWindowsVersionEx(OSVersion); - MsgBox('TigerVNC Windows Server is currently unmaintained and may not function correctly.', mbError, MB_OK); + MsgBox('TigerVNC Windows server is currently unmaintained and may not function correctly.', mbError, MB_OK); Result := True; end; @@ -137,11 +137,11 @@ begin o Modify Service-Mode start menu commands so they run as administrator. o Set up the SoftwareSASGeneration system policy so as to allow services to simulate Ctrl+Alt+Del. } if (CurStep = ssPostInstall) and (OSVersion.Major >= 6) then begin - SetRunAsUserFlag('{group}\VNC Server (Service-Mode)\Configure VNC Service.lnk'); - SetRunAsUserFlag('{group}\VNC Server (Service-Mode)\Register VNC Service.lnk'); - SetRunAsUserFlag('{group}\VNC Server (Service-Mode)\Unregister VNC Service.lnk'); - SetRunAsUserFlag('{group}\VNC Server (Service-Mode)\Start VNC Service.lnk'); - SetRunAsUserFlag('{group}\VNC Server (Service-Mode)\Stop VNC Service.lnk'); + SetRunAsUserFlag('{group}\VNC server (Service-Mode)\Configure VNC Service.lnk'); + SetRunAsUserFlag('{group}\VNC server (Service-Mode)\Register VNC Service.lnk'); + SetRunAsUserFlag('{group}\VNC server (Service-Mode)\Unregister VNC Service.lnk'); + SetRunAsUserFlag('{group}\VNC server (Service-Mode)\Start VNC Service.lnk'); + SetRunAsUserFlag('{group}\VNC server (Service-Mode)\Stop VNC Service.lnk'); if not RegQueryDWordValue( HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', 'SoftwareSASGeneration', Flags diff --git a/unix/vncconfig/QueryConnectDialog.cxx b/unix/vncconfig/QueryConnectDialog.cxx index aa1b78ad..a265356f 100644 --- a/unix/vncconfig/QueryConnectDialog.cxx +++ b/unix/vncconfig/QueryConnectDialog.cxx @@ -30,7 +30,7 @@ QueryConnectDialog::QueryConnectDialog(Display* dpy_, const char* user_, int timeout_, QueryResultCallback* cb) - : TXDialog(dpy_, 300, 100, "VNC Server : Accept Connection?"), + : TXDialog(dpy_, 300, 100, "VNC server : Accept connection?"), addressLbl(dpy, "Host:",this), address(dpy, address_, this), userLbl(dpy, "User:", this), diff --git a/unix/vncserver/vncserver.in b/unix/vncserver/vncserver.in index fdcce0e9..03eee275 100755 --- a/unix/vncserver/vncserver.in +++ b/unix/vncserver/vncserver.in @@ -238,7 +238,7 @@ close(XAUTH); $ENV{XAUTHORITY} = $xauthorityFile; -# Now start the X VNC Server +# Now start the X VNC server @cmd = ("xinit"); diff --git a/unix/vncserver/vncserver.users b/unix/vncserver/vncserver.users index 0a63784c..c215acdc 100644 --- a/unix/vncserver/vncserver.users +++ b/unix/vncserver/vncserver.users @@ -1,4 +1,4 @@ -# TigerVNC User assignment +# TigerVNC user assignment # # This file assigns users to specific VNC display numbers. # The syntax is =. E.g.: diff --git a/unix/x0vncserver/XDesktop.cxx b/unix/x0vncserver/XDesktop.cxx index fd19dd71..3e78a83f 100644 --- a/unix/x0vncserver/XDesktop.cxx +++ b/unix/x0vncserver/XDesktop.cxx @@ -71,7 +71,7 @@ BoolParameter rawKeyboard("RawKeyboard", "avoid mapping them to the current keyboard " "layout", false); IntParameter queryConnectTimeout("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/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx index fce32c74..0c3f5b93 100644 --- a/unix/x0vncserver/x0vncserver.cxx +++ b/unix/x0vncserver/x0vncserver.cxx @@ -251,7 +251,7 @@ char* programName; static void printVersion(FILE *fp) { - fprintf(fp, "TigerVNC Server version %s, built %s\n", + fprintf(fp, "TigerVNC server version %s, built %s\n", PACKAGE_VERSION, buildtime); } diff --git a/unix/x0vncserver/x0vncserver.man b/unix/x0vncserver/x0vncserver.man index 5bc8807a..ce4bd6a9 100644 --- a/unix/x0vncserver/x0vncserver.man +++ b/unix/x0vncserver/x0vncserver.man @@ -1,6 +1,6 @@ .TH X0VNCSERVER 1 "" "TigerVNC" "TigerVNC Manual" .SH NAME -x0vncserver \- TigerVNC Server for X displays +x0vncserver \- TigerVNC server for X displays .SH SYNOPSIS .B x0vncserver .RI [ options ] @@ -8,7 +8,7 @@ x0vncserver \- TigerVNC Server for X displays .B x0vncserver -version .SH DESCRIPTION .B x0vncserver -is a TigerVNC Server which makes any X display remotely accessible via VNC, +is a TigerVNC server which makes any X display remotely accessible via VNC, TigerVNC or compatible viewers. Unlike \fBXvnc\fP(1), it does not create a virtual display. Instead, it just shares an existing X server (typically, that one connected to the physical screen). @@ -180,7 +180,7 @@ connections. Default is off. . .TP .B \-QueryConnectTimeout \fIseconds\fP -Number of seconds to show the Accept Connection dialog before rejecting the +Number of seconds to show the Accept connection dialog before rejecting the connection. Default is \fB10\fP. . .TP diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc index e3bc57d8..5e81ee9b 100644 --- a/unix/xserver/hw/vnc/XserverDesktop.cc +++ b/unix/xserver/hw/vnc/XserverDesktop.cc @@ -68,7 +68,7 @@ BoolParameter rawKeyboard("RawKeyboard", "layout", false); IntParameter queryConnectTimeout("QueryConnectTimeout", "Number of seconds to show the " - "Accept Connection dialog before " + "Accept connection dialog before " "rejecting the connection", 10); diff --git a/unix/xserver/hw/vnc/Xvnc.man b/unix/xserver/hw/vnc/Xvnc.man index b9c429f7..d76b2cb2 100644 --- a/unix/xserver/hw/vnc/Xvnc.man +++ b/unix/xserver/hw/vnc/Xvnc.man @@ -278,7 +278,7 @@ QueryConnect to be supported. . .TP .B \-QueryConnectTimeout \fIseconds\fP -Number of seconds to show the Accept Connection dialog before rejecting the +Number of seconds to show the Accept connection dialog before rejecting the connection. Default is \fB10\fP. . .TP diff --git a/unix/xserver/hw/vnc/vncModule.c b/unix/xserver/hw/vnc/vncModule.c index 68900804..5f0886a3 100644 --- a/unix/xserver/hw/vnc/vncModule.c +++ b/unix/xserver/hw/vnc/vncModule.c @@ -50,7 +50,7 @@ ExtensionModule vncExt = static XF86ModuleVersionInfo vncVersRec = { "vnc", - "TigerVNC Project", + "TigerVNC project", MODINFOSTRING1, MODINFOSTRING2, VENDOR_RELEASE, diff --git a/vncviewer/OptionsDialog.cxx b/vncviewer/OptionsDialog.cxx index e04065ec..bb8c56b3 100644 --- a/vncviewer/OptionsDialog.cxx +++ b/vncviewer/OptionsDialog.cxx @@ -61,7 +61,7 @@ std::map OptionsDialog::callbacks; static std::set instances; OptionsDialog::OptionsDialog() - : Fl_Window(580, 420, _("TigerVNC Options")) + : Fl_Window(580, 420, _("TigerVNC options")) { int x, y; Fl_Navigation *navigation; diff --git a/vncviewer/ServerDialog.cxx b/vncviewer/ServerDialog.cxx index 8622fff1..45443d46 100644 --- a/vncviewer/ServerDialog.cxx +++ b/vncviewer/ServerDialog.cxx @@ -58,7 +58,7 @@ static LogWriter vlog("ServerDialog"); const char* SERVER_HISTORY="tigervnc.history"; ServerDialog::ServerDialog() - : Fl_Window(450, 0, _("VNC Viewer: Connection Details")) + : Fl_Window(450, 0, _("VNC viewer: Connection details")) { int x, y, x2; Fl_Button *button; @@ -83,7 +83,7 @@ ServerDialog::ServerDialog() button->callback(this->handleLoad, this); x2 += BUTTON_WIDTH + INNER_MARGIN; - button = new Fl_Button(x2, y, BUTTON_WIDTH, BUTTON_HEIGHT, _("Save As...")); + button = new Fl_Button(x2, y, BUTTON_WIDTH, BUTTON_HEIGHT, _("Save as...")); button->callback(this->handleSaveAs, this); x2 += BUTTON_WIDTH + INNER_MARGIN; diff --git a/vncviewer/org.tigervnc.vncviewer.metainfo.xml.in b/vncviewer/org.tigervnc.vncviewer.metainfo.xml.in index 6e982573..0a211a51 100644 --- a/vncviewer/org.tigervnc.vncviewer.metainfo.xml.in +++ b/vncviewer/org.tigervnc.vncviewer.metainfo.xml.in @@ -30,15 +30,15 @@ vncviewer.desktop - TigerVNC Viewer connection to a CentOS machine + TigerVNC viewer connection to a CentOS machine https://raw.githubusercontent.com/TigerVNC/tigervnc/741d3edbfab65eda6f033078bc06347fe244ea6a/vncviewer/metainfo/tigervnc-connection-linux.jpg - TigerVNC Viewer connection to a macOS machine + TigerVNC viewer connection to a macOS machine https://raw.githubusercontent.com/TigerVNC/tigervnc/741d3edbfab65eda6f033078bc06347fe244ea6a/vncviewer/metainfo/tigervnc-connection-macos.jpg - TigerVNC Viewer connection to a Windows machine + TigerVNC viewer connection to a Windows machine https://raw.githubusercontent.com/TigerVNC/tigervnc/741d3edbfab65eda6f033078bc06347fe244ea6a/vncviewer/metainfo/tigervnc-connection-windows.jpg diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx index a1d9b39d..84406470 100644 --- a/vncviewer/vncviewer.cxx +++ b/vncviewer/vncviewer.cxx @@ -102,9 +102,9 @@ static const char *about_text() // encodings, so we need to make sure we get a fresh string every // time. snprintf(buffer, sizeof(buffer), - _("TigerVNC Viewer v%s\n" + _("TigerVNC viewer v%s\n" "Built on: %s\n" - "Copyright (C) 1999-%d TigerVNC Team and many others (see README.rst)\n" + "Copyright (C) 1999-%d TigerVNC team and many others (see README.rst)\n" "See https://www.tigervnc.org for information on TigerVNC."), PACKAGE_VERSION, BUILD_TIMESTAMP, 2024); @@ -389,7 +389,7 @@ static void init_fltk() fl_message_hotspot(false); // Avoid empty titles for popups - fl_message_title_default(_("TigerVNC Viewer")); + fl_message_title_default(_("TigerVNC viewer")); // FLTK exposes these so that we can translate them. fl_no = _("No"); @@ -412,8 +412,8 @@ static void init_fltk() Fl_Mac_App_Menu::print = ""; // Don't want the print item Fl_Mac_App_Menu::services = _("Services"); - Fl_Mac_App_Menu::hide_others = _("Hide Others"); - Fl_Mac_App_Menu::show = _("Show All"); + Fl_Mac_App_Menu::hide_others = _("Hide others"); + Fl_Mac_App_Menu::show = _("Show all"); fl_mac_set_about(about_callback, nullptr); diff --git a/vncviewer/vncviewer.desktop.in.in b/vncviewer/vncviewer.desktop.in.in index 18f190fc..1a91755c 100644 --- a/vncviewer/vncviewer.desktop.in.in +++ b/vncviewer/vncviewer.desktop.in.in @@ -1,6 +1,6 @@ [Desktop Entry] -Name=TigerVNC Viewer -GenericName=Remote Desktop Viewer +Name=TigerVNC viewer +GenericName=Remote desktop viewer Comment=Connect to VNC server and display remote desktop Exec=@CMAKE_INSTALL_FULL_BINDIR@/vncviewer Icon=tigervnc diff --git a/vncviewer/vncviewer.man b/vncviewer/vncviewer.man index 79c410ae..ade45b78 100644 --- a/vncviewer/vncviewer.man +++ b/vncviewer/vncviewer.man @@ -130,7 +130,7 @@ window will be placed by the window manager by default. .B \-listen \fI[port]\fP Causes vncviewer to listen on the given port (default 5500) for reverse connections from a VNC server. WinVNC supports reverse connections initiated -using the 'Add New Client' menu option or the '\-connect' command-line option. +using the 'Add new client' menu option or the '\-connect' command-line option. Xvnc supports reverse connections with a helper program called .B vncconfig. . diff --git a/vncviewer/vncviewer.rc.in b/vncviewer/vncviewer.rc.in index 074c96ee..a186ee95 100644 --- a/vncviewer/vncviewer.rc.in +++ b/vncviewer/vncviewer.rc.in @@ -42,9 +42,9 @@ BEGIN BLOCK "080904b0" BEGIN VALUE "Comments", "\0" - VALUE "CompanyName", "TigerVNC Project\0" - VALUE "FileDescription", "TigerVNC Client\0" - VALUE "ProductName", "TigerVNC Client\0" + VALUE "CompanyName", "TigerVNC project\0" + VALUE "FileDescription", "TigerVNC client\0" + VALUE "ProductName", "TigerVNC client\0" VALUE "FileVersion", "@RCVERSION@\0" VALUE "InternalName", "vncviewer\0" VALUE "LegalCopyright", "Copyright (C) 1999-2024 TigerVNC Team and many others (see README.rst)\0" 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 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 @@ -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" -- 2.39.5