diff --git a/common/loginpage/src/index.html b/common/loginpage/src/index.html index d9b80d49a..1872aa144 100644 --- a/common/loginpage/src/index.html +++ b/common/loginpage/src/index.html @@ -151,7 +151,7 @@

Create new

- + diff --git a/win-linux/defaults.pri b/win-linux/defaults.pri index 28900e36e..642252b1d 100644 --- a/win-linux/defaults.pri +++ b/win-linux/defaults.pri @@ -7,6 +7,7 @@ CONFIG += app_bundle CONFIG += c++11 TRANSLATIONS = ./langs/en.ts \ + ./langs/en_GB.ts \ ./langs/ru.ts \ ./langs/de.ts \ ./langs/es.ts \ diff --git a/win-linux/langs/en_GB.qm b/win-linux/langs/en_GB.qm new file mode 100644 index 000000000..2c2b10f44 Binary files /dev/null and b/win-linux/langs/en_GB.qm differ diff --git a/win-linux/langs/en_GB.ts b/win-linux/langs/en_GB.ts index f128fa24a..b7e722d1a 100644 --- a/win-linux/langs/en_GB.ts +++ b/win-linux/langs/en_GB.ts @@ -4,7 +4,7 @@ CAscApplicationManagerWrapper - + Presenter View @@ -17,23 +17,23 @@ All the editor windows will be closed. Do you want to continue? - + You must restart the application for the settings to take effect. You need to restart the application for the settings to take effect. Restart now? - - + + Document%1.docx - + Book%1.xlsx - + Presentation%1.pptx @@ -41,7 +41,7 @@ CAscTabWidget - + Document Opening... @@ -66,70 +66,62 @@ CDialogOpenSsl - + Select certificate - + select certificate file... - + Certificate password: Certificate password: - + select key file... - + Key password: - - - - - Open Document - - - - + Enter certificate path - + Certificate is not supported - + Enter certificate password - + Wrong certificate password.<br>Please enter again Wrong certificate password.<br>Please enter once again - + Enter valid private key - + Key is not supported - + Enter key password @@ -176,32 +168,32 @@ CEditorWindow - + Open main window - + Document must be saved to continue.<br>Save the document? The document must be saved to continue.<br>Save the document? - + Print Document Print document - + Document must be saved firstly. The document must be saved first. - + %1 has been changed. Save changes? %1 has been modified.<br>Do you want to save the changes? - + Some data will lost.<br>Continue? If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue? @@ -209,12 +201,12 @@ CEditorWindowPrivate - + There are no printers available - + There are no pages set to print. @@ -524,6 +516,10 @@ + Jpeg (*.jpeg *.jpg);;Png (*.png);;Gif (*.gif);;Bmp (*.bmp);;Tiff (*.tiff *.tif) + + + Jpeg (*.jpeg *.jpg);;Png (*.png);;Gif (*.gif);;Bmp (*.bmp) @@ -553,58 +549,58 @@ CMainWindow - + More than one document is open.<br>Close the window anyway? - + Don't ask again. - - + + File format not supported. File format is not supported - + %1 doesn't exists!<br>Remove file from the list? %1 is not available. It might be renamed, moved or deleted.<br>Do you want to remove the file from the list? - + Document must be saved firstly. The document must be saved first. - + Document must be saved to continue.<br>Save the document? The document must be saved to continue.<br>Save the document? - + There are no printers available - + Print Document Print document - + There are no pages set to print. - + Sign Up Create portal - + %1 is modified.<br>Do you want to keep changes? %1 has been modified.<br>Do you want to save the changes? @@ -620,202 +616,191 @@ CPrintProgress - + Document is printing: page %1 of %2 Printing document: page %1 of %2 - Document is preparing - Preparing document - - - - &Cancel - - - - - Printing... - + Preparing document CUpdateManager - + Check for updates - + Unable to check update: URL not defined. - + To finish updating, restart app - + Restart - + Checking for updates... - + Updates are not allowed! - + This folder configuration does not allow for updates! The folder name should be: - + Downloading new version %1 (%2%) - + Cancel - + An error occurred while loading updates: package Url is empty! An error occurred while loading updates: package URL is empty! - + Update package error: md5 sum does not match the original. - + Preparing update... - + Update is available (version %1) - + Download update - + Current version is up to date - + An error occurred while unpacking the archive An error occurred while unpacking the archive - + Update download failed: out of memory! - + Update download failed: server connection error! - + Update download failed: wrong URL! - + Update download failed: unable to create file! - + Update download failed: network error! - + A service error has occurred! - + Last check performed %1 - + Preparing update (%1%) - + An error occurred while check updates: the Update Service is not installed or is not running! An error occurred while checking updates: the Update Service is not installed or is not running! - + An error occurred while loading updates: the Update Service is not installed or is not running! - + An error occurred while unzip updates: the Update Service is not installed or is not running! An error occurred while unzipping updates: the Update Service is not installed or is not running! - + Error opening JSON file. - + The current version does not support installing this update directly. To install updates, you can download the required package from the official website. - + Update is available - - + + Current version - - + + New version - + To finish updating, restart the app - + Would you like to download update now? - + Update is ready to install @@ -844,8 +829,8 @@ - - + + Access to file '%1' is denied! @@ -903,58 +888,58 @@ - + An error occurred while start install updates! An error occurred while start installing updates! - + An error occurred while start replacing files: Update Service not found! - + Cancel - + Yes - + No - + OK - + Skip - + Buy Now - + Activate - + Continue - + An error occurred while opening the portal:<br>%1 @@ -963,7 +948,7 @@ App can't work correctly under admin rights. - + File %1 is already loaded. Replace it? @@ -983,12 +968,12 @@ - + The syntaxis for the page range is invalid.<br>Enter one or more page ranges, for example: 1-3,7,11. - + Specified range %1-%2 exceeds document limits: maximum number of pages is %3 @@ -998,5 +983,23 @@ Unable to open print dialog:<br>%1 + + + Printing... + CPrintProgress + + + + + Document is preparing + CPrintProgress + Preparing document + + + + &Cancel + CPrintProgress + + diff --git a/win-linux/resources.qrc b/win-linux/resources.qrc index a3855ce60..d89398431 100644 --- a/win-linux/resources.qrc +++ b/win-linux/resources.qrc @@ -186,6 +186,7 @@ langs/de.qm langs/el_GR.qm langs/en.qm + langs/en_GB.qm langs/es.qm langs/et.qm langs/fi.qm diff --git a/win-linux/src/clangater.cpp b/win-linux/src/clangater.cpp index 9b07875fb..ef6642764 100644 --- a/win-linux/src/clangater.cpp +++ b/win-linux/src/clangater.cpp @@ -156,7 +156,8 @@ class CLangater::CLangaterIntf std::list m_dirs; QMap> m_langs{ - {"en-US", {"English", ""}}, + {"en-US", {"English (United States)", ""}}, + {"en-GB", {"English (United Kingdom)", ""}}, {"ru-RU", {"Русский", "Russian"}}, {"de-DE", {"Deutsch", "German"}}, {"fr-FR", {"Français", "French"}},