diff --git a/docs/source/conf.py b/docs/source/conf.py index b8dbf3f6..19ed3014 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -42,7 +42,7 @@ templates_path = ["_templates"] source_suffix = ".rst" master_doc = "index" today_fmt = "%A, %d %B %Y at %H:%M" -language = None +language = "en" exclude_patterns = [] pygments_style = "sphinx" pygments_dark_style = "monokai" diff --git a/docs/source/index.rst b/docs/source/index.rst index 20c39895..f35ac64c 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -27,8 +27,8 @@ JSON files. See the :ref:`a_breakdown_storage` section for more details. Any operating system that can run Python 3 and has the Qt 5 libraries should be able to run novelWriter. It runs fine on Linux, Windows and macOS, and users have tested it on other platforms -too. novelWriter can be run directly from the Python source, installed from the pip tool. See -:ref:`a_started` for more details. +too. novelWriter can be run directly from the Python source, or installed from packages or the pip +tool. See :ref:`a_started` for more details. .. note:: Version 1.5 introduced a few changes that will require you to make a few minor modifications to diff --git a/docs/source/requirements.txt b/docs/source/requirements.txt index 465c82d2..777d09c0 100644 --- a/docs/source/requirements.txt +++ b/docs/source/requirements.txt @@ -1,4 +1,4 @@ furo -sphinx~=4.0 -pygments~=2.7 +sphinx>=4.0 +pygments>=2.7 docutils==0.17.1 diff --git a/i18n/nw_base.ts b/i18n/nw_base.ts index d4241a2b..22f5923d 100644 --- a/i18n/nw_base.ts +++ b/i18n/nw_base.ts @@ -77,264 +77,264 @@ Constant - - - + + + None - + Novel - - + + Plot - - + + Characters - - + + Locations - - + + Timeline + + + + Objects + + - Objects + Entities - Entities - - - - - Custom - + Archive - + Trash - - + + Novel Document - - + + Project Note - + Root Folder - + Folder - + Novel Title Page - + Novel Chapter - + Novel Scene - + Novel Section - + Tag - + Point of View - - + + Focus - + Title - + Level - + Document - + Line - + Chars - + Words - + Pars - + POV - + Synopsis - + Straight single quotation mark - + Straight double quotation mark - + Left single quotation mark - + Right single quotation mark - + Single low-9 quotation mark - + Single high-reversed-9 quotation mark - + Left double quotation mark - + Right double quotation mark - + Double low-9 quotation mark - + Double high-reversed-9 quotation mark - + Double low-reversed-9 quotation mark - + Single left-pointing angle quotation mark - + Single right-pointing angle quotation mark - + Double left-pointing angle quotation mark - + Double right-pointing angle quotation mark - + Left corner bracket - + Right corner bracket - + Left white corner bracket - + Right white corner bracket @@ -809,32 +809,32 @@ GuiDocEditFooter - + Status - + Line: {0} ({1}) - + Words: {0} ({1}) - + Document size is {0} bytes - + Words: {0} selected - + Character count: {0} @@ -842,22 +842,22 @@ GuiDocEditHeader - + Edit document label - + Search document - + Toggle Focus Mode - + Close the document @@ -865,58 +865,58 @@ GuiDocEditSearch - - + + Search - + Replace - + Case Sensitive - + Whole Words Only - + RegEx Mode - + Loop Search - + Search Next File - + Preserve Case - + Close Search - + Find in current document - + Find and replace in current document @@ -924,117 +924,117 @@ GuiDocEditor - + The document you are trying to open is too big. The document size is {0} MB. The maximum size allowed is {1} MB. - + Opened Document: {0} - + The text you are trying to add is too big. The text size is {0} MB. The maximum size allowed is {1} MB. - + File Changed on Disk - + This document has been changed outside of novelWriter while it was open. Overwrite the file on disk? - + Could not save document. - + Saved Document: {0} - + Spell checking requires the package PyEnchant. It does not appear to be installed. - + Spell check complete - + File Location - + The currently open file is saved in: - + The document has grown too big and you cannot add more text to it. The maximum size of a single novelWriter document is {0} MB. - + Follow Tag - + Cut - + Copy - + Paste - + Select All - + Select Word - + Select Paragraph - + Spelling Suggestion(s) - + No Suggestions - + Add Word to Dictionary - + Please select some text before calling replace quotes. @@ -1118,42 +1118,42 @@ GuiDocViewFooter - + Show/hide the references panel - + Activate to freeze the content of the references panel when changing document - + Show comments - + Show synopsis comments - + References - + Sticky - + Comments - + Synopsis @@ -1161,22 +1161,22 @@ GuiDocViewHeader - + Go backward - + Go forward - + Reload the document - + Close the document @@ -1189,22 +1189,22 @@ - + Copy - + Select All - + Select Word - + Select Paragraph @@ -1291,173 +1291,173 @@ GuiMain - + You are running an untested development version of novelWriter. Please be careful when working on a live project and make sure you take regular backups. - + novelWriter is ready ... - + Cannot create a new project when another project is open. - + A project already exists in that location. Please choose another folder. - + Close Project - + Close the current project? - - + + Changes are saved automatically. - + Backup Project - + Backup the current project? - + The project was locked by the computer '{0}' ({1} {2}), last active on {3}. - + Project Locked - + The project is already open by another instance of novelWriter, and is therefore locked. Override lock and continue anyway? - + Note: If the program or the computer previously crashed, the lock can safely be overridden. However, overriding it is not recommended if the project is open in another instance of novelWriter. Doing so may corrupt the project. - + The project index is outdated or broken. Rebuilding index. - + Text files ({0}) - + Markdown files ({0}) - + novelWriter files ({0}) - + All files ({0}) - + Import File - + Could not read file. The file must be an existing text file. - + Please open a document to import the text file into. - + Import Document - + Importing the file will overwrite the current content of the document. Do you want to proceed? - + Indexing completed in {0} ms - + The project index has been successfully rebuilt. - + Some changes will not be applied until novelWriter has been restarted. - + Information - + Warning - + Error - + This is a bug! - + Internal Error - + Exit - + Do you want to exit novelWriter? - + Could not find the reference for tag '{0}'. It either doesn't exist, or the index is out of date. The index can be updated from the Tools menu, or by pressing {1}. @@ -2063,38 +2063,38 @@ GuiMainStatus - - + + None - + Editor - + Project - + Session Time - + Words: {0} ({1}) - + Project word count (session change) - + Novel word count (session change) @@ -2102,47 +2102,47 @@ GuiNovelToolBar - + Novel Outline - + Refresh - + Novel Root - + Last Column - + Hidden - + Point of View Character - + Focus Character - + Novel Plot - + More Options @@ -2150,7 +2150,7 @@ GuiNovelTree - + No meta data @@ -2158,65 +2158,65 @@ GuiOutlineDetails - - - - + + + + Title - + Chapter - + Scene - + Section - + Document - + Status - + Characters - + Words - + Paragraphs - + Synopsis - + Title Details - + Reference Tags @@ -2224,7 +2224,7 @@ GuiOutlineHeaderMenu - + Select Columns @@ -2232,17 +2232,17 @@ GuiOutlineToolBar - + Outline of - + Refresh - + All Novel Folders @@ -3556,6 +3556,74 @@ + + GuiSideBar + + + Project + + + + + Project Tree View + + + + + Novel + + + + + Novel Tree View + + + + + Outline + + + + + Novel Outline View + + + + + Build + + + + + Build Novel Project + + + + + Details + + + + + Project Details + + + + + Stats + + + + + Writing Statistics + + + + + Settings + + + GuiUpdates @@ -3590,74 +3658,6 @@ - - GuiViewsBar - - - Project - - - - - Project Tree View - - - - - Novel - - - - - Novel Tree View - - - - - Outline - - - - - Novel Outline View - - - - - Build - - - - - Build Novel Project - - - - - Details - - - - - Project Details - - - - - Stats - - - - - Writing Statistics - - - - - Settings - - - GuiWordList @@ -3833,173 +3833,173 @@ NWProject - + Could not delete document file. - + Unknown - + Project file does not appear to be a novelWriterXML file. - + Unknown or unsupported novelWriter project file format. The project cannot be opened by this version of novelWriter. The file was saved with novelWriter version {0}. - + Failed to parse project xml. - + File Version - + The file format of your project is about to be updated. If you proceed, older versions of novelWriter will no longer be able to open this project. Continue? - + Version Conflict - + This project was saved by a newer version of novelWriter, version {0}. This is version {1}. If you continue to open the project, some attributes and settings may not be preserved, but the overall project should be fine. Continue opening the project? - + Opened Project: {0} - + There is no project open. - + Failed to save project. - + Saved Project: {0} - + Backing up project ... - + Cannot backup project because no valid backup path is set. Please set a valid backup location in Preferences. - + Cannot backup project because no project name is set. Please set a Project Name in Project Settings. - + Could not create backup folder. - + Backup from {0} - + Backup archive file written to: {0} - + Could not write backup archive. - + Project backed up to '{0}' - + New - + Note - + Draft - + Finished - + Minor - + Major - + Main - + and - + Found {0} orphaned file(s) in project folder. - + Recovered - + [{0}] {1} - + Recovered File {0} - + One or more orphaned files could not be added back into the project. Make sure at least a Novel root folder exists. diff --git a/novelwriter/gui/__init__.py b/novelwriter/gui/__init__.py index 17699942..bbe814d2 100644 --- a/novelwriter/gui/__init__.py +++ b/novelwriter/gui/__init__.py @@ -28,7 +28,7 @@ from novelwriter.gui.outline import GuiOutlineView from novelwriter.gui.projtree import GuiProjectView from novelwriter.gui.statusbar import GuiMainStatus from novelwriter.gui.theme import GuiTheme -from novelwriter.gui.viewsbar import GuiViewsBar +from novelwriter.gui.sidebar import GuiSideBar __all__ = [ "GuiDocEditor", @@ -41,5 +41,5 @@ __all__ = [ "GuiOutlineView", "GuiProjectView", "GuiTheme", - "GuiViewsBar", + "GuiSideBar", ] diff --git a/novelwriter/gui/viewsbar.py b/novelwriter/gui/sidebar.py similarity index 95% rename from novelwriter/gui/viewsbar.py rename to novelwriter/gui/sidebar.py index da85275c..59d827b7 100644 --- a/novelwriter/gui/viewsbar.py +++ b/novelwriter/gui/sidebar.py @@ -1,7 +1,7 @@ """ -novelWriter – GUI Main Window Views ToolBar +novelWriter – GUI Main Window SideBar =========================================== -GUI class for the main window "Views" toolbar +GUI class for the main window side bar File History: Created: 2022-05-10 [1.7b1] @@ -36,14 +36,14 @@ from novelwriter.enum import nwView logger = logging.getLogger(__name__) -class GuiViewsBar(QToolBar): +class GuiSideBar(QToolBar): viewChangeRequested = pyqtSignal(nwView) def __init__(self, mainGui): super().__init__(parent=mainGui) - logger.debug("Initialising GuiViewsBar ...") + logger.debug("Initialising GuiSideBar ...") self.mainConf = novelwriter.CONFIG self.mainGui = mainGui @@ -123,7 +123,7 @@ class GuiViewsBar(QToolBar): self.updateTheme() - logger.debug("GuiViewsBar initialisation complete") + logger.debug("GuiSideBar initialisation complete") return @@ -142,4 +142,4 @@ class GuiViewsBar(QToolBar): return -# END Class GuiViewsBar +# END Class GuiSideBar diff --git a/novelwriter/guimain.py b/novelwriter/guimain.py index 3c9fbe56..1aab1e88 100644 --- a/novelwriter/guimain.py +++ b/novelwriter/guimain.py @@ -41,7 +41,7 @@ from PyQt5.QtWidgets import ( from novelwriter.gui import ( GuiDocEditor, GuiDocViewDetails, GuiDocViewer, GuiItemDetails, GuiMainMenu, GuiMainStatus, GuiNovelView, GuiOutlineView, GuiProjectView, GuiTheme, - GuiViewsBar + GuiSideBar ) from novelwriter.dialogs import ( GuiAbout, GuiPreferences, GuiProjectDetails, GuiProjectLoad, @@ -118,7 +118,7 @@ class GuiMain(QMainWindow): self.itemDetails = GuiItemDetails(self) self.outlineView = GuiOutlineView(self) self.mainMenu = GuiMainMenu(self) - self.viewsBar = GuiViewsBar(self) + self.viewsBar = GuiSideBar(self) # Project Tree Stack self.projStack = QStackedWidget()