From 9e9e1362ac2eb1056dcd302881863ccb7c74fa06 Mon Sep 17 00:00:00 2001 From: XinyuHou Date: Wed, 6 May 2015 14:25:18 +0100 Subject: [PATCH] Fixed typo and regenerated master ts #4596 --- src/gui/gui.ts | 733 +++++++++++++++++++++++++------------- src/gui/src/WebClient.cpp | 2 +- 2 files changed, 479 insertions(+), 256 deletions(-) diff --git a/src/gui/gui.ts b/src/gui/gui.ts index a2cf4001..d7d27136 100644 --- a/src/gui/gui.ts +++ b/src/gui/gui.ts @@ -144,6 +144,24 @@ Visit our website for help and info (synergy-project.org). + + AddClientDialog + + + Dialog + + + + + TextLabel + + + + + Ignore auto connect clients + + + HotkeyDialogBase @@ -160,175 +178,215 @@ Visit our website for help and info (synergy-project.org). MainWindow - + &Start - + &File - + &Edit - + &Window - + &Help - + <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - - Synergy will be minimized to the notification area. This will happen automatically when Synergy starts. - - - - + Program can not be started - + The executable<br><br>%1<br><br>could not be successfully started, although it does exist. Please check if you have sufficient permissions to run this program. - + Synergy client not found - + The executable for the synergy client does not exist. - + Hostname is empty - + Please fill in a hostname for the synergy client to connect to. - + Cannot write configuration file - + The temporary configuration file required to start synergy can not be written. - + Configuration filename invalid - + You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - + Synergy server not found - + The executable for the synergy server does not exist. - + Synergy terminated with an error - + Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - + &Stop - - Elevate Synergy + + Please add the server (%1) to the grid. - - Are you sure you want to elevate Synergy? + + Please drag the new client screen (%1) to the desired position on the grid. + + + + + Failed to detect system architecture. + + + + + Cancel + + + + + Failed to download Bonjour installer to location: %1 + + + + + Do you want to enable auto config and install Bonjour? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This feature helps you establish the connection. - + + Auto config feature requires Bonjour. + +Do you want to install Bonjour? + + + + Synergy is starting. - + Synergy is running. - + Synergy is not running. - + Unknown - - Synergy Premium - - - - + + + Synergy - + Browse for a synergys config file - + + Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + + + + + Security question + + + + + Do you trust this fingerprint? + +%1 + +This is a server fingerprint. You should compare this fingerprint to the one on your server's screen. If the two don't match exactly, then it's probably not the server you're expecting (it could be a malicious user). + +To automatically trust this fingerprint for future connections, click Yes. To reject this fingerprint and disconnect from the server, click No. + + + + Save configuration as... - + Save failed - + Could not save configuration to file. @@ -341,164 +399,163 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - + + Ser&ver (share this computer's mouse and keyboard): + + + + Screen name: - + &Server IP: - - + + &Start - - &Server (share this computer's mouse and keyboard): - - - - + Use existing configuration: - + &Configuration file: - + &Browse... - + Configure interactively: - + &Configure Server... - - &Client (use another computer's keyboard and mouse): - - - - + Ready - + Log - + &Apply - - &Elevate - - - - - Please help us <a href="http://synergy-project.org/donate/?source=gui-notice">fund this project</a> if you like Synergy. - Please help us <a href="http://synergy-project.org/donate/?source=gui-notice">fund this project</a> if you like Synergy. - - - - + IP addresses: - + + Fingerprint: + + + + + &Client (use another computer's mouse and keyboard): + + + + + Auto config + + + + &About Synergy... - + &Quit - + Quit - + Run - + S&top - + Stop - + S&how Status - + &Hide - + Hide - + &Show - + Show - + Save configuration &as... - + Save the interactively generated server configuration to a file. - + Settings - + Edit settings - + Run Wizard @@ -511,20 +568,98 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but + + PluginManager + + + Failed to get plugin directory. + + + + + Failed to get profile directory. + + + + + Failed to download plugin '%1' to: %2 +%3 + + + + + Could not get Windows architecture type. + + + + + Could not get Linux architecture type. + + + + + PluginWizardPage + + + Setup Synergy + + + + + Please wait... + + + + + Error: %1 + + + + + + Setup complete. + + + + + Downloading '%1' plugin (%2/%3)... + + + + + Plugins installed successfully. + + + + + Generating SSL certificate... + + + + + Downloading plugin: %1 (1/%2) + + + + + Getting plugin list... + + + QObject - + Synergy Configurations (*.sgc);;All files (*.*) - + Synergy Configurations (*.conf);;All files (*.*) - + System tray is unavailable, quitting. @@ -727,164 +862,177 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but + + ServerConfigDialog + + + Configure server + + + ServerConfigDialogBase - + Server Configuration - + Screens and links - + Drag a screen from the grid to the trashcan to remove it. - + Configure the layout of your synergy server configuration. - + Drag this button to the grid to add a new screen. - + Drag new screens to the grid or move existing ones around. Drag a screen to the trashcan to delete it. Double click on a screen to edit its settings. - + Hotkeys - + &Hotkeys - + &New - + &Edit - + &Remove - + A&ctions - + Ne&w - + E&dit - + Re&move - + Advanced server settings - + &Switch - + Switch &after waiting - - - + + + ms - + Switch on double &tap within - + &Options - + &Check clients every - + Use &relative mouse moves - + S&ynchronize screen savers - + Don't take &foreground window on Windows servers - + + Ignore auto config clients + + + + &Dead corners - + To&p-left - + Top-rig&ht - + &Bottom-left - + Bottom-ri&ght - + Cor&ner Size: @@ -892,13 +1040,20 @@ Double click on a screen to edit its settings. SettingsDialog - - Encryption password must not be empty. + + Save log file to... - - Save log file to... + + Elevate Synergy + + + + + Are you sure you want to elevate Synergy? + +This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. @@ -925,27 +1080,47 @@ Double click on a screen to edit its settings. - + + Elevate mode + + + + + &Hide on startup + + + + + &Network Security + + + + + Use &SSL encryption (unique certificate) + + + + Logging - + &Logging level: - + Log to file: - + Browse... - + Error @@ -954,53 +1129,38 @@ Double click on a screen to edit its settings. &Language: - - - &Encryption - - &Miscellaneous - - Pass&word: - - - - - Enable - - - - + Warning - + Note - + Info - + Debug - + Debug1 - + Debug2 @@ -1008,59 +1168,20 @@ Double click on a screen to edit its settings. SetupWizard - + Setup Synergy - - + Please select an option. - + Please enter your email address and password. - - - Sorry, an error occured while trying to sign in. Please contact the help desk, and provide the following details. - -%1 - - - - - Login failed, invalid email or password. - - - - - Login failed, an error occurred. - -%1 - - - - - Login failed, an error occurred. - -Server response: - -%1 - - - - - Encryption password required. - - - - - Encryption password and confirmation do not match. - - SetupWizardBase @@ -1086,90 +1207,88 @@ Server response: - Synergy Premium + Activate - Yes, I have Synergy Premium + &Activate now... - - &Email: + + Email: - - <a href="http://synergy-project.org/premium/reset/?source=gui">Forgot password</a> - <a href="http://synergy-project.org/premium/reset/?source=gui">Forgot password</a> + + Password: - - Tell me more... + + <a href="https://synergy-project.org/account/reset/">Forgot password</a> - - Not interested + + &Skip activation - + + &Server (share this computer's mouse and keyboard) + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">My main mouse and keyboard are connected to this computer. This will allow you to move your mouse over to another computer's screen. There can only be one server in your setup.</span></p></body></html> + + + + + &Client (use another computer's mouse and keyboard) + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">You have already set up a server. This computer will be controlled using the server's mouse and keyboard. There can be many clients in your setup.</span></p></body></html> + + + + Server or Client? + + + SslCertificate - - &Server (new setup) + + Failed to get profile directory. - - This is the first computer you are configuring. Your keyboard and mouse are connected to this computer. This will allow you to move your mouse over to another computer's screen. There can only be one server in your setup. + + SSL certificate generated. - - &Client (add to setup) + + SSL fingerprint generated. - - You have already set up a server. This is a computer you wish to control using the server's keyboard and mouse. There can be many clients in your setup. - You have already set up a server. This a computer you wish to control using the server's keyboard and mouse. There can be many clients in your setup. - - - - - Encryption - - - - - A longer password will provide stronger encryption. It is a good idea to use 20 characters or more. - - - - - - &Password: - - - - - Network traffic can be easily monitored on public networks (e.g. schools and corporate networks) or WiFi networks. Using encryption can reduce the risk that sensitive information (e.g. passwords) will be revealed to others. - - - - - Enable encryption - - - - - &Confirm: + + Failed to find SSL fingerprint. @@ -1181,4 +1300,108 @@ Server response: + + WebClient + + + An error occurred while trying to sign in. Please contact the helpdesk, and provide the following details. + +%1 + + + + + Login failed, invalid email or password. + + + + + Login failed, an error occurred. + +%1 + + + + + Login failed, an error occurred. + +Server response: + +%1 + + + + + An error occurred while trying to query the plugin list. Please contact the help desk, and provide the following details. + +%1 + + + + + Get plugin list failed, invalid user email or password. + + + + + Get plugin list failed, an error occurred. + +%1 + + + + + Get plugin list failed, an error occurred. + +Server response: + +%1 + + + + + ZeroconfService + + + zeroconf server detected: %1 + + + + + zeroconf client detected: %1 + + + + + + Zero configuration service + + + + + Error code: %1. + + + + + Unable to start the zeroconf: %1. + + + + + Synergy + + + + + Failed to get local IP address. Please manually type in server address on your clients + + + + + + %1 + + + diff --git a/src/gui/src/WebClient.cpp b/src/gui/src/WebClient.cpp index 5daf5ab8..e0b11c37 100644 --- a/src/gui/src/WebClient.cpp +++ b/src/gui/src/WebClient.cpp @@ -98,7 +98,7 @@ void WebClient::queryPluginList() } catch (std::exception& e) { - emit error(tr("An error occured while trying to query the " + emit error(tr("An error occurred while trying to query the " "plugin list. Please contact the help desk, and " "provide the following details.\n\n%1").arg(e.what())); return;