diff --git a/src/main.cpp b/src/main.cpp index c34c9f9b..d21fb2bd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -44,7 +44,7 @@ bool verifyConfigAvaliability(QString path, bool checkExistingConfig) if (opened2) { // Verify if the config can be loaded. auto conf = StructFromJsonString(configFile.readAll()); - LOG(MODULE_CONFIG, "Path: " + path.toStdString() + " contains a config file version: " + to_string(conf.config_version)) + LOG(MODULE_CONFIG, "Path: " + path.toStdString() + " contains a config file, in version " + to_string(conf.config_version)) configFile.close(); return true; } else { @@ -52,7 +52,7 @@ bool verifyConfigAvaliability(QString path, bool checkExistingConfig) return false; } } catch (...) { - LOG(MODULE_CONFIG, "Exception raised when checking path: " + configFile.fileName().toStdString()) + LOG(MODULE_CONFIG, "Exception raised when checking config: " + configFile.fileName().toStdString()) return false; } } else return true; @@ -101,7 +101,6 @@ bool initialiseQv2ray() // None of the path above can be used as a dir for storing config. LOG(MODULE_INIT, "FATAL") LOG(MODULE_INIT, " ---> CANNOT find a proper place to store Qv2ray config files.") - LOG(MODULE_INIT, " ---> Qv2ray will now EXIT") QString searchPath = Stringify(configFilePaths, NEWLINE); QvMessageBox(nullptr, QObject::tr("Cannot Start Qv2ray"), QObject::tr("Cannot find a place to store config files.") + NEWLINE + @@ -183,11 +182,11 @@ int main(int argc, char *argv[]) auto langs = getFileList(QDir(":/translations")); if (langs.empty()) { - LOG(MODULE_UI, "FAILED to find any translations. THIS IS A BUILD ERROR.") - QvMessageBox(nullptr, "Cannot load languages", "Qv2ray will run, but you are not able to select languages."); + LOG(MODULE_INIT, "FAILED to find any translations. THIS IS A BUILD ERROR.") + QvMessageBox(nullptr, "Cannot load languages", "Qv2ray will run, but you cannot change the UI language."); } else { for (auto lang : langs) { - LOG(MODULE_UI, "Found Translator: " + lang.toStdString()) + LOG(MODULE_INIT, "Found Translator: " + lang.toStdString()) } } @@ -213,7 +212,7 @@ int main(int argc, char *argv[]) auto qStringLang = QSTRING(lang); if (_qApp.installTranslator(getTranslator(&qStringLang)) || qStringLang == "en-US") { - LOG(MODULE_UI, "Loaded Translator " + lang) + LOG(MODULE_INIT, "Loaded Translator " + lang) } else { // Do not translate these..... QvMessageBox( diff --git a/translations/en-US.ts b/translations/en-US.ts index 57a69c06..af020325 100644 --- a/translations/en-US.ts +++ b/translations/en-US.ts @@ -1,229 +1,6 @@ - - ConnectionEditWindow - - - EditConnectionSettings - - - - - Alias - - - - - Tag - - - - - - Host - - - - - Port - - - - - - - Type - - - - - Socks - - - - - Outbound Settings - - - - - UUID - - - - - Alter ID - - - - - - Security - - - - - Use TLS - - - - - - - - - - Enabled - - - - - Mux Settings - - - - - Concurrency - - - - - Transport - - - - - Transport Settings - - - - - Request - - - - - Response - - - - - - Edit in Json Editor - - - - - - Default Value - - - - - - - Path - - - - - - Headers - - - - - Format: Key|Value - - - - - MTU - - - - - TTI (ms) - - - - - Uplink Capacity (MB/s) - - - - - Congestion - - - - - Downlink Capacity (MB/s) - - - - - Read Buffer Size (MB) - - - - - Write Buffer Size (MB) - - - - - Key - - - - - Mark - - - - - TCP Fast Open - - - - - TProxy - - - - - Email - - - - - - Password - - - - - Encryption Method - - - - - Level - - - - - OTA - - - - - Username - - - ImportConfigWindow @@ -324,19 +101,291 @@ - - + + VMess String Check - + VMess string is not valid. - - Some internal error occured. + + VMess config is not valid. + + + + + InboundEditor + + + Inbound Editor + + + + + Tag + + + + + Tag of this inbound entry + + + + + Listening + + + + + Hostname or IP Address + + + + + : + + + + + Port: 1080|80-85 + + + + + Protocol + + + + + Allocation Settings + + + + + Strategy + + + + + always + + + + + random + + + + + Refresh + + + + + Concurrency + + + + + Sniffing Settings + + + + + Destination Override + + + + + + + + + Enabled + + + + + HTTP Inbound Settings + + + + + + Timeout + + + + + Allow Transparent + + + + + + + + User Level + + + + + + + + ... + + + + + + Password + + + + + + Add + + + + + + Username + + + + + + Accounts + + + + + SOCKS Inbound Settings + + + + + Auth + + + + + Enable UDP + + + + + Local UDP IP + + + + + 127.0.0.1 + + + + + Dokodemo-Door Inbound Settings + + + + + IP Address + + + + + Not necessary when setting "Follow Redirect" + + + + + Port + + + + + Network + + + + + TCP + + + + + UDP + + + + + Follow Redirect + + + + + MTProto Inbound Settings + + + + + EMail Address + + + + + Secret + + + + + SECRET + + + + + Inbound type not supported + + + + + The inbound type is not supported by Qv2ray (yet). Please use JsonEditor to change the settings + + + + + Inbound: + + + + + + Removing a user + + + + + + You haven't selected a user yet. + + + + + + Add a user + + + + + + This user exists already. @@ -348,22 +397,22 @@ - + Json Structure Preview - + Json Editor - + OK - + Format Json @@ -393,569 +442,1007 @@ MainWindow - + Qv2ray - - + + Connect - - + + Disconnect - - + + Reconnect - + Clear Log - + Prefrences - + Stopped - + Host List - + + { } + + + + Config Details - + Type - - Host - - - - - Port - - - - - Detail - - - - + Ping - - QR - - - - - :// - - - - - Json - - - - + #AddConnection - + A - - + + #ImportConnection - + I - + #EditConnection - + ... - + #RemoveConnection - + R - + + Address + + + + + Port Number + + + + + Routes Count + + + + + + TextLabel + + + + + Mux + + + + + QR Code + + + + + VMess + + + + Log - + + Speed Graph + + + + + Speed + + + + + 0.00 B/s +0.00 B/s + + + + + Data + + + + + 0.00 B +0.00 B + + + + #ManuallyCreateConnection - + #Exit - + #Preferences - + #Start - + #Stop - + #Restart - - + + Hide - + Quit - + Rename - + Connect to this - + Edit as Json - - - + + + Show - + Update - + Found a new version: - + Download Link: - - + + No connection selected! - + Share as vmess:// - + Share as QRCore - - + + Please select a config from the list. - - + + + Connected To Server: - - Connected: - - - - + Disconnected - - UUID - - - - - AlterID - - - - - Transport - - - - - Email - - - - - Encryption - - - - - Username - - - - - + + Rename a Connection - + The name cannot be empty - + + Removing this Connection - - + + Failed to delete connection file, please delete manually. + + + + + No Config Selected - - + + Please Select a Config - + The name has been used already, Please choose another. - + + Connected + + + + Are you sure to remove this connection? + + OutboundEditor + + + EditConnectionSettings + + + + + Tag + + + + + Tag of this outbound setting + + + + + + Host + + + + + Hostname or IP/IPv6 Address + + + + + + Port + + + + + + + Type + + + + + Socks + + + + + Mux Settings + + + + + Use Mux + + + + + + + + + Enabled + + + + + Concurrency + + + + + Outbound Settings + + + + + UUID + + + + + Alter ID + + + + + 64 + + + + + + Security + + + + + Use TLS + + + + + Transport + + + + + Transport Settings + + + + + + Default Value + + + + + Request + + + + + + Edit in Json Editor + + + + + Response + + + + + + + Path + + + + + /wsPath + + + + + + Headers + + + + + MTU + + + + + TTI (ms) + + + + + Uplink Capacity (MB/s) + + + + + Congestion + + + + + Downlink Capacity (MB/s) + + + + + Read Buffer Size (MB) + + + + + Write Buffer Size (MB) + + + + + Key + + + + + keys + + + + + Mark + + + + + TCP Fast Open + + + + + TProxy + + + + + Email + + + + + + Password + + + + + Encryption Method + + + + + Level + + + + + OTA + + + + + Username + + + PrefrencesWindow - - - - - + + + + + Prefrences - + General - + Language - + zh-CN - + en-US - + Log Level - + none - + debug - + info - + warning - + error - + Automatically Connect To - + Transparent Proxy Support - - - - - - - - + + + + + + + + + + Enabled - - #Select - - - - + v2ray Assets Path - + + + Select + + + + + Statistics + + + + + API Port + + + + + v2ray Core Path + + + + InBound Settings - - Listen IP - - - - - SOCKS InBound Settings - - - - - + + Port - - + + Authentication - - + + Username - - + + Password - - HTTP InBound Settings + + Listening Address - + + SOCKS Inbound Settings + + + + + SOCKS UDP + + + + + Local IP + + + + + HTTP Inbound Settings + + + + Route Settings - + Enable Proxy - + Bypass Chinese Mainland - + Use Local DNS - + DNS List - + + NetSpeed Bar Settings + + + + + Items + + + + + + + + + ... + + + + + Page Y Offset + + + + + Pages + + + + + Lines + + + + + Text Style + + + + + Font + + + + + + Bold + + + + + + Italic + + + + + Size + + + + + Color + + + + + A: + + + + + R: + + + + + G: + + + + + B: + + + + + Style + + + + + Content + + + + + Content Type + + + + + Text/Tag + + + + + You can config how the network speed toolbar looks like in this panel + + + + + Apply Network Speed Bar UI Settings + + + + About - + Qv2ray - + Version: - + Official Repo: - + <html><head/><body><p><a href="https://github.com/lhy0403/Qv2ray"><span style=" text-decoration: underline; color:#2980b9;">https://github.com/lhy0403/Qv2ray</span></a></p></body></html> - + License: - + <html><head/><body><p><a href="https://www.gnu.org/licenses/gpl-3.0.txt"><span style=" text-decoration: underline; color:#2980b9;">GPLv3 (https://www.gnu.org/licenses/gpl-3.0.txt)</span></a></p></body></html> - + About Qt - + Ingore Next Version - + Cancel - + + Built Time + + + + + Page + + + + + Item(s) + + + + Port numbers cannot be the same - + + Open v2ray core file + + + + + Enable tProxy Support - + This will append capabilities to the v2ray executable. - + + Qv2ray will copy your v2ray core to this path: + + + + If anything goes wrong after enabling this, please refer to issue #57 or the link below: - - + + Qv2ray cannot copy one or both v2ray files from: + + + + + to this path: + + + + + Failed to setcap onto v2ray executable. You may need to run `setcap` manually. - + tProxy is not supported on macOS and Windows - + Open v2ray assets folder @@ -963,47 +1450,78 @@ QObject - + Qv2ray Cannot Continue - + You are running a lower version of Qv2ray compared to the current config file. - + Please report if you think this is an error. - + + Qv2ray will now exit. - + + Cannot Start Qv2ray + + + + + Cannot find a place to store config files. + + + + + Qv2ray has searched these paths below: + + + + DependencyMissing - + Cannot find openssl libs - + This could be caused by a missing of `openssl` package in your system. Or an AppImage issue. - + If you are using AppImage, please report a bug. - + + Please refer to Github Issue #65 to check for solutions. + + + + + Github Issue Link: + + + + + Technical Details + + + + Another instance of Qv2ray is already running. @@ -1013,169 +1531,283 @@ - + Cannot start v2ray - + v2ray core file cannot be found at: + + + Please go to prefrence window to change the location. + + + + + Or put v2ray core file in the location above. + + + + + Stats is not enabled + + + + + Connected + + + + + Disconnected + + + + + Connecting + + + + + Custom Text + + + + + Current Time + + + + + Current Date + + + + + Current Qv2ray Version + + + + + Current Connection Name + + + + + Current Connection Status + + + + + Total Upload Speed + + + + + Total Download Speed + + + + + Upload Speed for Specific Tag + + + + + Download Speed for Specific Tag + + + + + Total Uploaded Data + + + + + Total Downloaded Data + + + + + Uploaded Data for Specific Tag + + + + + Downloaded Data for Specific Tag + + RouteEditor - + Dialog - + Routes List - + + Enabled + + + + InBounds - + DomainOrIP - + Outbound - - - - - - + + + + + + ... - + Change IO - + Route Information - + Domains - + IPs - + Inbound List - + Add Default - + Inbound Information - - + + Tag - - + + Type - - + + Address - - + + Port - + Outbound List - + Add "Direct" - + Outbound Information - + + Edit - + Status - - - + + + NoTag - + #NoTag - + + Cannot Edit - + + Currently, this type of outbound is not supported by the editor. + + + + We will launch Json Editor instead. + + SubscribeEditor - + #UpdateInProcess - + #TryLater @@ -1183,77 +1815,77 @@ w_SubscribeEditor - + SubscribeEditor - + #AddConnection - + A - + #RemoveConnection - + R - + ... - + Name - + URL - + Config List - + Update Subscription - + Config Detail - + Type - + Server - + Config - + Port