From 5c35ebeffa33a8be0b635b9367115feeb95c8e96 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 13 Jun 2024 01:00:01 +0200 Subject: [PATCH 01/67] Rewrite HTML tag insertion to check for correct open and close of tags (#1919) --- novelwriter/core/tohtml.py | 90 ++++++++++++++++++++++++++------------ 1 file changed, 62 insertions(+), 28 deletions(-) diff --git a/novelwriter/core/tohtml.py b/novelwriter/core/tohtml.py index ac336628..d9221e29 100644 --- a/novelwriter/core/tohtml.py +++ b/novelwriter/core/tohtml.py @@ -37,28 +37,35 @@ from novelwriter.types import FONT_STYLE, FONT_WEIGHTS logger = logging.getLogger(__name__) -HTML5_TAGS = { - Tokenizer.FMT_B_B: "", - Tokenizer.FMT_B_E: "", - Tokenizer.FMT_I_B: "", - Tokenizer.FMT_I_E: "", - Tokenizer.FMT_D_B: "", - Tokenizer.FMT_D_E: "", - Tokenizer.FMT_U_B: "", - Tokenizer.FMT_U_E: "", - Tokenizer.FMT_M_B: "", - Tokenizer.FMT_M_E: "", - Tokenizer.FMT_SUP_B: "", - Tokenizer.FMT_SUP_E: "", - Tokenizer.FMT_SUB_B: "", - Tokenizer.FMT_SUB_E: "", - Tokenizer.FMT_DL_B: "", - Tokenizer.FMT_DL_E: "", - Tokenizer.FMT_ADL_B: "", - Tokenizer.FMT_ADL_E: "", - Tokenizer.FMT_STRIP: "", +# Each opener tag, with the id of its corresponding closer and tag format +HTML_OPENER: dict[int, tuple[int, str]] = { + Tokenizer.FMT_B_B: (Tokenizer.FMT_B_E, ""), + Tokenizer.FMT_I_B: (Tokenizer.FMT_I_E, ""), + Tokenizer.FMT_D_B: (Tokenizer.FMT_D_E, ""), + Tokenizer.FMT_U_B: (Tokenizer.FMT_U_E, ""), + Tokenizer.FMT_M_B: (Tokenizer.FMT_M_E, ""), + Tokenizer.FMT_SUP_B: (Tokenizer.FMT_SUP_E, ""), + Tokenizer.FMT_SUB_B: (Tokenizer.FMT_SUB_E, ""), + Tokenizer.FMT_DL_B: (Tokenizer.FMT_DL_E, ""), + Tokenizer.FMT_ADL_B: (Tokenizer.FMT_ADL_E, ""), } +# Each closer tag, with the id of its corresponding opener and tag format +HTML_CLOSER: dict[int, tuple[int, str]] = { + Tokenizer.FMT_B_E: (Tokenizer.FMT_B_B, ""), + Tokenizer.FMT_I_E: (Tokenizer.FMT_I_B, ""), + Tokenizer.FMT_D_E: (Tokenizer.FMT_D_B, ""), + Tokenizer.FMT_U_E: (Tokenizer.FMT_U_B, ""), + Tokenizer.FMT_M_E: (Tokenizer.FMT_M_B, ""), + Tokenizer.FMT_SUP_E: (Tokenizer.FMT_SUP_B, ""), + Tokenizer.FMT_SUB_E: (Tokenizer.FMT_SUB_B, ""), + Tokenizer.FMT_DL_E: (Tokenizer.FMT_DL_B, ""), + Tokenizer.FMT_ADL_E: (Tokenizer.FMT_ADL_B, ""), +} + +# Empty HTML tag record +HTML_NONE = (0, "") + class ToHtml(Tokenizer): """Core: HTML Document Writer @@ -447,19 +454,46 @@ class ToHtml(Tokenizer): def _formatText(self, text: str, tFmt: T_Formats) -> str: """Apply formatting tags to text.""" temp = text - for pos, fmt, data in reversed(tFmt): - html = "" - if fmt == self.FMT_FNOTE: + + # Build a list of all html tags that need to be inserted in the text. + # This is done in the forward direction, and a tag is only opened if it + # isn't already open, and only closed if it has previously been opened. + tags: list[tuple[int, str]] = [] + state = dict.fromkeys(HTML_OPENER, False) + for pos, fmt, data in tFmt: + if m := HTML_OPENER.get(fmt): + if not state.get(fmt, True): + tags.append((pos, m[1])) + state[fmt] = True + elif m := HTML_CLOSER.get(fmt): + if state.get(m[0], False): + tags.append((pos, m[1])) + state[m[0]] = False + elif fmt == self.FMT_FNOTE: if data in self._footnotes: index = len(self._usedNotes) + 1 self._usedNotes[data] = index - html = f"{index}" + tags.append((pos, f"{index}")) else: - html = "ERR" - else: - html = HTML5_TAGS.get(fmt, "") - temp = f"{temp[:pos]}{html}{temp[pos:]}" + tags.append((pos, "ERR")) + + # Check all format types and close any tag that is still open. This + # ensures that unclosed tags don't spill over to the next paragraph. + end = len(text) + for opener, active in state.items(): + if active: + closer = HTML_OPENER.get(opener, HTML_NONE)[0] + tags.append((end, HTML_CLOSER.get(closer, HTML_NONE)[1])) + + # Insert all tags at their correct position, starting from the back. + # The reverse order ensures that the positions are not shifted while we + # insert tags. + for pos, tag in reversed(tags): + temp = f"{temp[:pos]}{tag}{temp[pos:]}" + + # Replace all line breaks with proper HTML break tags temp = temp.replace("\n", "
") + return stripEscape(temp) def _formatSynopsis(self, text: str, synopsis: bool) -> str: From babc39c6a2a6be8635de55e7f5e6fe91ee44b974 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 13 Jun 2024 15:48:09 +0200 Subject: [PATCH 02/67] Add test coverage --- tests/test_core/test_core_tohtml.py | 40 +++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/tests/test_core/test_core_tohtml.py b/tests/test_core/test_core_tohtml.py index 9e150295..7974cef4 100644 --- a/tests/test_core/test_core_tohtml.py +++ b/tests/test_core/test_core_tohtml.py @@ -275,12 +275,12 @@ def testCoreToHtml_ConvertParagraphs(mockGUI): CONFIG.altDialogOpen = "::" CONFIG.altDialogClose = "::" html.setDialogueHighlight(True) - html._text = "## Chapter\n\nThis text :: has alt dialogue :: in it.\n\n" + html._text = "## Chapter\n\nThis text ::has alt dialogue:: in it.\n\n" html.tokenizeText() html.doConvert() assert html.result == ( "

Chapter

\n" - "

This text :: has alt dialogue :: in it.

\n" + "

This text ::has alt dialogue:: in it.

\n" ) # Footnotes @@ -308,6 +308,42 @@ def testCoreToHtml_ConvertParagraphs(mockGUI): ) +@pytest.mark.core +def testCoreToHtml_CloseTags(mockGUI): + """Test automatic closing of HTML tags for shortcodes.""" + project = NWProject() + html = ToHtml(project) + + html._isNovel = True + html._isFirst = True + + # Unclosed Shortcodes + html._text = "Text [b][i][s][u][m][sup][sub]text text text.\n" + html.tokenizeText() + html.doConvert() + assert html.result == ( + "

Text " + "text text text.

\n" + ) + + # Double Shortcodes + html._text = "Text [b][i][s][u][m][sup][sub]text [b][i][s][u][m][sup][sub]text text.\n" + html.tokenizeText() + html.doConvert() + assert html.result == ( + "

Text " + "text text text.

\n" + ) + + # Redundant Close Shortcodes + html._text = "Text text [/b][/i][/s][/u][/m][/sup][/sub]text text.\n" + html.tokenizeText() + html.doConvert() + assert html.result == ( + "

Text text text text.

\n" + ) + + @pytest.mark.core def testCoreToHtml_ConvertDirect(mockGUI): """Test the converter directly using the ToHtml class.""" From ddaced1b7806e6e0e79819ea1d208872e9d6fca2 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Fri, 14 Jun 2024 16:09:52 +0200 Subject: [PATCH 03/67] Update the Inno Setup installer script to change compression method and fix some warnings and issues --- setup/win_setup_embed.iss | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/setup/win_setup_embed.iss b/setup/win_setup_embed.iss index b08b58c3..dc856f69 100644 --- a/setup/win_setup_embed.iss +++ b/setup/win_setup_embed.iss @@ -1,5 +1,4 @@ -; Script generated by the Inno Setup Script Wizard. -; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! +; Script for building setup.exe installer with Inno Setup #define nwAppDir "%%dir%%\dist" #define nwAppName "novelWriter" @@ -18,6 +17,7 @@ AppPublisherURL={#nwAppURL} AppSupportURL={#nwAppURL} AppUpdatesURL={#nwAppURL} SetupIconFile=setup\icons\novelwriter.ico +UninstallDisplayIcon={app}\novelwriter.ico DefaultDirName={autopf}\{#nwAppName} LicenseFile=setup\iss_license.txt DisableProgramGroupPage=yes @@ -25,10 +25,10 @@ UsedUserAreasWarning=no PrivilegesRequiredOverridesAllowed=dialog OutputDir={#nwAppDir} OutputBaseFilename=novelwriter-{#nwAppVersion}-amd64-setup -Compression=lzma +Compression=zip SolidCompression=yes WizardStyle=modern -ArchitecturesInstallIn64BitMode=x64 +ArchitecturesInstallIn64BitMode=x64compatible ChangesAssociations=yes [Languages] @@ -36,11 +36,14 @@ Name: "english"; MessagesFile: "compiler:Default.isl" [Tasks] Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked -Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 6.1; Check: not IsAdminInstallMode +Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; Check: not IsAdminInstallMode [InstallDelete] Type: filesandordirs; Name: "{app}\novelwriter\*" +[UninstallDelete] +Type: filesandordirs; Name: "{app}\novelwriter\*" + [Files] Source: "{#nwAppDir}\novelWriter\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs From 2a99cafbf23cc84ffc0632de148a0d371beec844 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 16 Jun 2024 00:21:54 +0200 Subject: [PATCH 04/67] Add a class to store last used paths --- novelwriter/config.py | 78 ++++++++++++++++++++++++++++++++++------ novelwriter/constants.py | 1 + 2 files changed, 68 insertions(+), 11 deletions(-) diff --git a/novelwriter/config.py b/novelwriter/config.py index 148e75d4..d651908d 100644 --- a/novelwriter/config.py +++ b/novelwriter/config.py @@ -103,7 +103,8 @@ class Config: # User Settings # ============= - self._recentObj = RecentProjects(self) + self._recentProjects = RecentProjects(self) + self._recentPaths = RecentPaths(self) # General GUI Settings self.guiLocale = self._qLocale.name() @@ -253,7 +254,7 @@ class Config: @property def recentProjects(self) -> RecentProjects: - return self._recentObj + return self._recentProjects @property def mainWinSize(self) -> list[int]: @@ -343,7 +344,7 @@ class Config: self._outlnPanePos = [int(x/self.guiScale) for x in pos] return - def setLastPath(self, path: str | Path) -> None: + def setLastPath(self, path: str | Path, key: str | None = None) -> None: """Set the last used path. Only the folder is saved, so if the path is not a folder, the parent of the path is used instead. """ @@ -352,8 +353,8 @@ class Config: if not path.is_dir(): path = path.parent if path.is_dir(): - self._lastPath = path - logger.debug("Last path updated: %s" % self._lastPath) + self._recentPaths.setPath(key or "default", path) + self._recentPaths.saveCache() return def setBackupPath(self, path: Path | str) -> None: @@ -438,11 +439,12 @@ class Config: return self._appPath / "assets" / target return self._appPath / "assets" - def lastPath(self) -> Path: + def lastPath(self, key: str | None = None) -> Path: """Return the last path used by the user, if it exists.""" - if isinstance(self._lastPath, Path): - if self._lastPath.is_dir(): - return self._lastPath + if path := self._recentPaths.getPath(key or "default"): + asPath = Path(path) + if asPath.is_dir(): + return asPath return self._homePath def backupPath(self) -> Path: @@ -531,7 +533,8 @@ class Config: (self._dataPath / "syntax").mkdir(exist_ok=True) (self._dataPath / "themes").mkdir(exist_ok=True) - self._recentObj.loadCache() + self._recentPaths.loadCache() + self._recentProjects.loadCache() self._checkOptionalPackages() logger.debug("Config instance initialised") @@ -811,7 +814,7 @@ class Config: """Pack a list of items into a comma-separated string for saving to the config file. """ - return ", ".join([str(inVal) for inVal in data]) + return ", ".join(str(inVal) for inVal in data) def _checkOptionalPackages(self) -> None: """Check optional packages used by some features.""" @@ -893,3 +896,56 @@ class RecentProjects: logger.debug("Removed recent: %s", path) self.saveCache() return + + +class RecentPaths: + + KEYS = ["default", "project", "import", "outline", "stats"] + + def __init__(self, config: Config) -> None: + self._conf = config + self._data = {} + return + + def setPath(self, key: str, path: Path | str) -> None: + """Set a path for a given key.""" + if key in self.KEYS: + self._data[key] = str(path) + + def getPath(self, key: str) -> str | None: + """Get a path for a given key, or return None.""" + return self._data.get(key) + + def loadCache(self) -> bool: + """Load the cache file for recent projects.""" + self._data = {} + + cacheFile = self._conf.dataPath(nwFiles.RECENT_PATH) + if cacheFile.is_file(): + try: + with open(cacheFile, mode="r", encoding="utf-8") as inFile: + data = json.load(inFile) + for key, path in data.items(): + if isinstance(path, str) and key in self.KEYS: + data[key] = path + except Exception: + logger.error("Could not load recent paths cache") + logException() + return False + + return True + + def saveCache(self) -> bool: + """Save the cache dictionary of recent projects.""" + cacheFile = self._conf.dataPath(nwFiles.RECENT_PATH) + cacheTemp = cacheFile.with_suffix(".tmp") + try: + with open(cacheTemp, mode="w+", encoding="utf-8") as outFile: + json.dump(self._data, outFile, indent=2) + cacheTemp.replace(cacheFile) + except Exception: + logger.error("Could not save recent paths cache") + logException() + return False + + return True diff --git a/novelwriter/constants.py b/novelwriter/constants.py index bf62caeb..5186a5d1 100644 --- a/novelwriter/constants.py +++ b/novelwriter/constants.py @@ -104,6 +104,7 @@ class nwFiles: # Config Files CONF_FILE = "novelwriter.conf" RECENT_FILE = "recentProjects.json" + RECENT_PATH = "recentPaths.json" # Project Root Files PROJ_FILE = "nwProject.nwx" From 928a1166661c2f0d720fe36d83913bf9200c3b1e Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 16 Jun 2024 00:22:38 +0200 Subject: [PATCH 05/67] Update current usage of last path --- novelwriter/config.py | 4 ++-- novelwriter/gui/outline.py | 4 ++-- novelwriter/guimain.py | 4 ++-- novelwriter/tools/welcome.py | 4 ++-- novelwriter/tools/writingstats.py | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/novelwriter/config.py b/novelwriter/config.py index d651908d..f9cd6a08 100644 --- a/novelwriter/config.py +++ b/novelwriter/config.py @@ -344,7 +344,7 @@ class Config: self._outlnPanePos = [int(x/self.guiScale) for x in pos] return - def setLastPath(self, path: str | Path, key: str | None = None) -> None: + def setLastPath(self, key: str, path: str | Path) -> None: """Set the last used path. Only the folder is saved, so if the path is not a folder, the parent of the path is used instead. """ @@ -353,7 +353,7 @@ class Config: if not path.is_dir(): path = path.parent if path.is_dir(): - self._recentPaths.setPath(key or "default", path) + self._recentPaths.setPath(key, path) self._recentPaths.saveCache() return diff --git a/novelwriter/gui/outline.py b/novelwriter/gui/outline.py index d404794a..aa3d756d 100644 --- a/novelwriter/gui/outline.py +++ b/novelwriter/gui/outline.py @@ -523,12 +523,12 @@ class GuiOutlineTree(QTreeWidget): @pyqtSlot() def exportOutline(self) -> None: """Export the outline as a CSV file.""" - path = CONFIG.lastPath() / f"{makeFileNameSafe(SHARED.project.data.name)}.csv" + path = CONFIG.lastPath("outline") / f"{makeFileNameSafe(SHARED.project.data.name)}.csv" path, _ = QFileDialog.getSaveFileName( self, self.tr("Save Outline As"), str(path), formatFileFilter(["*.csv", "*"]) ) if path: - CONFIG.setLastPath(path) + CONFIG.setLastPath("outline", path) logger.info("Writing CSV file: %s", path) cols = [col for col in self._treeOrder if not self._colHidden[col]] order = [self._colIdx[col] for col in cols] diff --git a/novelwriter/guimain.py b/novelwriter/guimain.py index 6fd1e1be..ed4b1650 100644 --- a/novelwriter/guimain.py +++ b/novelwriter/guimain.py @@ -652,7 +652,7 @@ class GuiMain(QMainWindow): logger.error("No project open") return False - lastPath = CONFIG.lastPath() + lastPath = CONFIG.lastPath("import") ffilter = formatFileFilter(["*.txt", "*.md", "*.nwd", "*"]) loadFile, _ = QFileDialog.getOpenFileName( self, self.tr("Import File"), str(lastPath), filter=ffilter @@ -667,7 +667,7 @@ class GuiMain(QMainWindow): try: with open(loadFile, mode="rt", encoding="utf-8") as inFile: text = inFile.read() - CONFIG.setLastPath(loadFile) + CONFIG.setLastPath("import", loadFile) except Exception as exc: SHARED.error(self.tr( "Could not read file. The file must be an existing text file." diff --git a/novelwriter/tools/welcome.py b/novelwriter/tools/welcome.py index 3f47b707..a4405d1b 100644 --- a/novelwriter/tools/welcome.py +++ b/novelwriter/tools/welcome.py @@ -220,8 +220,8 @@ class GuiWelcome(NDialog): @pyqtSlot() def _browseForProject(self) -> None: """Browse for a project to open.""" - if path := SHARED.getProjectPath(self, path=CONFIG.lastPath(), allowZip=False): - CONFIG.setLastPath(path) + if path := SHARED.getProjectPath(self, path=CONFIG.lastPath("project"), allowZip=False): + CONFIG.setLastPath("project", path) self._openProjectPath(path) return diff --git a/novelwriter/tools/writingstats.py b/novelwriter/tools/writingstats.py index 8e42a0c0..864ad177 100644 --- a/novelwriter/tools/writingstats.py +++ b/novelwriter/tools/writingstats.py @@ -384,14 +384,14 @@ class GuiWritingStats(NToolDialog): return False # Generate the file name - savePath = CONFIG.lastPath() / f"sessionStats.{fileExt}" + savePath = CONFIG.lastPath("stats") / f"sessionStats.{fileExt}" savePath, _ = QFileDialog.getSaveFileName( self, self.tr("Save Data As"), str(savePath), f"{textFmt} (*.{fileExt})" ) if not savePath: return False - CONFIG.setLastPath(savePath) + CONFIG.setLastPath("stats", savePath) # Do the actual writing wSuccess = False From ea247c581435dece9dcb8b3296b0ca1536f8516f Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 16 Jun 2024 00:31:02 +0200 Subject: [PATCH 06/67] Remember new project folder last used path (#1930) --- novelwriter/config.py | 8 ++++---- novelwriter/tools/welcome.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/novelwriter/config.py b/novelwriter/config.py index f9cd6a08..cd456428 100644 --- a/novelwriter/config.py +++ b/novelwriter/config.py @@ -919,15 +919,15 @@ class RecentPaths: def loadCache(self) -> bool: """Load the cache file for recent projects.""" self._data = {} - cacheFile = self._conf.dataPath(nwFiles.RECENT_PATH) if cacheFile.is_file(): try: with open(cacheFile, mode="r", encoding="utf-8") as inFile: data = json.load(inFile) - for key, path in data.items(): - if isinstance(path, str) and key in self.KEYS: - data[key] = path + if isinstance(data, dict): + for key, path in data.items(): + if key in self.KEYS and isinstance(path, str): + self._data[key] = path except Exception: logger.error("Could not load recent paths cache") logException() diff --git a/novelwriter/tools/welcome.py b/novelwriter/tools/welcome.py index a4405d1b..c2c516bf 100644 --- a/novelwriter/tools/welcome.py +++ b/novelwriter/tools/welcome.py @@ -221,7 +221,6 @@ class GuiWelcome(NDialog): def _browseForProject(self) -> None: """Browse for a project to open.""" if path := SHARED.getProjectPath(self, path=CONFIG.lastPath("project"), allowZip=False): - CONFIG.setLastPath("project", path) self._openProjectPath(path) return @@ -550,7 +549,7 @@ class _NewProjectForm(QWidget): def __init__(self, parent: QWidget) -> None: super().__init__(parent=parent) - self._basePath = CONFIG.homePath() + self._basePath = CONFIG.lastPath("project") self._fillMode = self.FILL_BLANK self._copyPath = None @@ -726,12 +725,13 @@ class _NewProjectForm(QWidget): @pyqtSlot() def _doBrowse(self) -> None: """Select a project folder.""" - if projDir := QFileDialog.getExistingDirectory( + if path := QFileDialog.getExistingDirectory( self, self.tr("Select Project Folder"), str(self._basePath), options=QFileDialog.Option.ShowDirsOnly ): - self._basePath = Path(projDir) + self._basePath = Path(path) self._updateProjPath() + CONFIG.setLastPath("project", path) return @pyqtSlot() From 35632abea32a5b0ea2423a5a5921acd97354b0b5 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 16 Jun 2024 00:37:21 +0200 Subject: [PATCH 07/67] Update current tests --- novelwriter/config.py | 4 ---- tests/conftest.py | 2 +- tests/reference/baseConfig_novelwriter.conf | 3 +-- tests/test_base/test_base_config.py | 12 ++++++------ 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/novelwriter/config.py b/novelwriter/config.py index cd456428..7eed2ed6 100644 --- a/novelwriter/config.py +++ b/novelwriter/config.py @@ -181,7 +181,6 @@ class Config: self.fmtPadThin = False # User Paths - self._lastPath = self._homePath # The user's last used path self._backupPath = self._backPath # Backup path to use, can be none # Spell Checking Settings @@ -518,7 +517,6 @@ class Config: logger.debug("Data Path: %s", self._dataPath) logger.debug("App Root: %s", self._appRoot) logger.debug("App Path: %s", self._appPath) - logger.debug("Last Path: %s", self._lastPath) logger.debug("PDF Manual: %s", self.pdfDocs) # If the config and data folders don't exist, create them @@ -603,7 +601,6 @@ class Config: self.hideHScroll = conf.rdBool(sec, "hidehscroll", self.hideHScroll) self.lastNotes = conf.rdStr(sec, "lastnotes", self.lastNotes) self.nativeFont = conf.rdBool(sec, "nativefont", self.nativeFont) - self._lastPath = conf.rdPath(sec, "lastpath", self._lastPath) # Sizes sec = "Sizes" @@ -713,7 +710,6 @@ class Config: "hidehscroll": str(self.hideHScroll), "lastnotes": str(self.lastNotes), "nativefont": str(self.nativeFont), - "lastpath": str(self._lastPath), } conf["Sizes"] = { diff --git a/tests/conftest.py b/tests/conftest.py index 5ea7cbb2..a4bc9ce9 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -50,7 +50,7 @@ def resetConfigVars(): """Reset the CONFIG object and set various values for testing to prevent interfering with local OS. """ - CONFIG.setLastPath(_TMP_ROOT) + # CONFIG.setLastPath(_TMP_ROOT) CONFIG.setBackupPath(_TMP_ROOT) CONFIG.setGuiFont(None) CONFIG.setTextFont(None) diff --git a/tests/reference/baseConfig_novelwriter.conf b/tests/reference/baseConfig_novelwriter.conf index 0554bd6d..b9d485a2 100644 --- a/tests/reference/baseConfig_novelwriter.conf +++ b/tests/reference/baseConfig_novelwriter.conf @@ -1,5 +1,5 @@ [Meta] -timestamp = 2024-05-20 16:48:20 +timestamp = 2024-06-16 00:36:27 [Main] font = @@ -10,7 +10,6 @@ hidevscroll = False hidehscroll = False lastnotes = 0x0 nativefont = True -lastpath = [Sizes] mainwindow = 1200, 650 diff --git a/tests/test_base/test_base_config.py b/tests/test_base/test_base_config.py index 93a09a75..bb2ec406 100644 --- a/tests/test_base/test_base_config.py +++ b/tests/test_base/test_base_config.py @@ -213,21 +213,21 @@ def testBaseConfig_Methods(fncPath): assert tstConf.assetPath("stuff") == appPath / "assets" / "stuff" # Last Path - assert tstConf.lastPath() == Path.home().absolute() + assert tstConf.lastPath("project") == Path.home().absolute() tmpStuff = fncPath / "stuff" tmpStuff.mkdir() - tstConf.setLastPath(tmpStuff) - assert tstConf.lastPath() == tmpStuff + tstConf.setLastPath("project", tmpStuff) + assert tstConf.lastPath("project") == tmpStuff fileStuff = tmpStuff / "more_stuff.txt" fileStuff.write_text("Stuff") - tstConf.setLastPath(fileStuff) - assert tstConf.lastPath() == tmpStuff + tstConf.setLastPath("project", fileStuff) + assert tstConf.lastPath("project") == tmpStuff fileStuff.unlink() tmpStuff.rmdir() - assert tstConf.lastPath() == Path.home().absolute() + assert tstConf.lastPath("project") == Path.home().absolute() # Backup Path assert tstConf.backupPath() == tstConf._backPath From fe27acc3ef6ff9898619ebe5f68d32e966bd3ca5 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 16 Jun 2024 00:49:24 +0200 Subject: [PATCH 08/67] Add full test coverage --- novelwriter/config.py | 5 +-- tests/test_base/test_base_config.py | 58 ++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/novelwriter/config.py b/novelwriter/config.py index 7eed2ed6..1e8be1aa 100644 --- a/novelwriter/config.py +++ b/novelwriter/config.py @@ -353,7 +353,6 @@ class Config: path = path.parent if path.is_dir(): self._recentPaths.setPath(key, path) - self._recentPaths.saveCache() return def setBackupPath(self, path: Path | str) -> None: @@ -907,6 +906,8 @@ class RecentPaths: """Set a path for a given key.""" if key in self.KEYS: self._data[key] = str(path) + self.saveCache() + return def getPath(self, key: str) -> str | None: """Get a path for a given key, or return None.""" @@ -928,7 +929,6 @@ class RecentPaths: logger.error("Could not load recent paths cache") logException() return False - return True def saveCache(self) -> bool: @@ -943,5 +943,4 @@ class RecentPaths: logger.error("Could not save recent paths cache") logException() return False - return True diff --git a/tests/test_base/test_base_config.py b/tests/test_base/test_base_config.py index bb2ec406..c5ca9b72 100644 --- a/tests/test_base/test_base_config.py +++ b/tests/test_base/test_base_config.py @@ -20,6 +20,7 @@ along with this program. If not, see . """ from __future__ import annotations +import json import sys from pathlib import Path @@ -28,7 +29,7 @@ from shutil import copyfile import pytest from novelwriter import CONFIG -from novelwriter.config import Config, RecentProjects +from novelwriter.config import Config, RecentPaths, RecentProjects from novelwriter.constants import nwFiles from tests.mocked import MockApp, causeOSError @@ -440,3 +441,58 @@ def testBaseConfig_RecentCache(monkeypatch, tstPaths): assert recent.listEntries() == [ (str(pathOne), "Proj One", 100, 1600002000), ] + + +@pytest.mark.base +def testBaseConfig_RecentPaths(monkeypatch, tstPaths): + """Test recent paths file.""" + cacheFile = tstPaths.cnfDir / nwFiles.RECENT_PATH + recent = RecentPaths(CONFIG) + + # Load when there is no file should pass, but load nothing + assert not cacheFile.exists() + assert recent.loadCache() is True + assert recent._data == {} + + # Set valid paths + recent.setPath("default", tstPaths.cnfDir / "default") + recent.setPath("project", tstPaths.cnfDir / "project") + recent.setPath("import", tstPaths.cnfDir / "import") + recent.setPath("outline", tstPaths.cnfDir / "outline") + recent.setPath("stats", tstPaths.cnfDir / "stats") + + # Set invalid path + recent.setPath("foobar", tstPaths.cnfDir / "foobar") + + # Check valid paths + assert recent.getPath("default") == str(tstPaths.cnfDir / "default") + assert recent.getPath("project") == str(tstPaths.cnfDir / "project") + assert recent.getPath("import") == str(tstPaths.cnfDir / "import") + assert recent.getPath("outline") == str(tstPaths.cnfDir / "outline") + assert recent.getPath("stats") == str(tstPaths.cnfDir / "stats") + + # Check invalid path + assert recent.getPath("foobar") is None + + # Check file + expected = { + "default": str(tstPaths.cnfDir / "default"), + "project": str(tstPaths.cnfDir / "project"), + "import": str(tstPaths.cnfDir / "import"), + "outline": str(tstPaths.cnfDir / "outline"), + "stats": str(tstPaths.cnfDir / "stats"), + } + + assert cacheFile.exists() + assert json.loads(cacheFile.read_text()) == expected + + # Clear and reload + recent._data = {} + recent.loadCache() + assert recent._data == expected + + # Check error handling + with monkeypatch.context() as mp: + mp.setattr("builtins.open", causeOSError) + assert recent.saveCache() is False + assert recent.loadCache() is False From df34293e7488452586abf1c0dc5bf50edf9bac78 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 16 Jun 2024 00:54:48 +0200 Subject: [PATCH 09/67] Update docstring --- novelwriter/config.py | 1 + 1 file changed, 1 insertion(+) diff --git a/novelwriter/config.py b/novelwriter/config.py index 1e8be1aa..38ae7d52 100644 --- a/novelwriter/config.py +++ b/novelwriter/config.py @@ -5,6 +5,7 @@ novelWriter – Config Class File History: Created: 2018-09-22 [0.0.1] Config Created: 2022-11-09 [2.0rc2] RecentProjects +Created: 2024-06-16 [2.5rc1] RecentPaths This file is a part of novelWriter Copyright 2018–2024, Veronica Berglyd Olsen From 1b7d331e41a98b2fbff36a9a54825d4596fa3483 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 16 Jun 2024 00:55:33 +0200 Subject: [PATCH 10/67] Update more docstring --- novelwriter/config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/novelwriter/config.py b/novelwriter/config.py index 38ae7d52..fa12ac07 100644 --- a/novelwriter/config.py +++ b/novelwriter/config.py @@ -904,7 +904,7 @@ class RecentPaths: return def setPath(self, key: str, path: Path | str) -> None: - """Set a path for a given key.""" + """Set a path for a given key, and save the cache.""" if key in self.KEYS: self._data[key] = str(path) self.saveCache() @@ -915,7 +915,7 @@ class RecentPaths: return self._data.get(key) def loadCache(self) -> bool: - """Load the cache file for recent projects.""" + """Load the cache file for recent paths.""" self._data = {} cacheFile = self._conf.dataPath(nwFiles.RECENT_PATH) if cacheFile.is_file(): @@ -933,7 +933,7 @@ class RecentPaths: return True def saveCache(self) -> bool: - """Save the cache dictionary of recent projects.""" + """Save the cache dictionary of recent paths.""" cacheFile = self._conf.dataPath(nwFiles.RECENT_PATH) cacheTemp = cacheFile.with_suffix(".tmp") try: From a3381f1f796951193e4c251d07060937b20a767d Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 16 Jun 2024 11:23:42 +0200 Subject: [PATCH 11/67] Remove fallback parameter for lastPath and remove commented out code --- novelwriter/config.py | 4 ++-- novelwriter/tools/welcome.py | 2 +- tests/conftest.py | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/novelwriter/config.py b/novelwriter/config.py index fa12ac07..d122a0b1 100644 --- a/novelwriter/config.py +++ b/novelwriter/config.py @@ -438,9 +438,9 @@ class Config: return self._appPath / "assets" / target return self._appPath / "assets" - def lastPath(self, key: str | None = None) -> Path: + def lastPath(self, key: str) -> Path: """Return the last path used by the user, if it exists.""" - if path := self._recentPaths.getPath(key or "default"): + if path := self._recentPaths.getPath(key): asPath = Path(path) if asPath.is_dir(): return asPath diff --git a/novelwriter/tools/welcome.py b/novelwriter/tools/welcome.py index c2c516bf..b962e98c 100644 --- a/novelwriter/tools/welcome.py +++ b/novelwriter/tools/welcome.py @@ -220,7 +220,7 @@ class GuiWelcome(NDialog): @pyqtSlot() def _browseForProject(self) -> None: """Browse for a project to open.""" - if path := SHARED.getProjectPath(self, path=CONFIG.lastPath("project"), allowZip=False): + if path := SHARED.getProjectPath(self, path=CONFIG.homePath(), allowZip=False): self._openProjectPath(path) return diff --git a/tests/conftest.py b/tests/conftest.py index a4bc9ce9..c8abbfda 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -50,7 +50,6 @@ def resetConfigVars(): """Reset the CONFIG object and set various values for testing to prevent interfering with local OS. """ - # CONFIG.setLastPath(_TMP_ROOT) CONFIG.setBackupPath(_TMP_ROOT) CONFIG.setGuiFont(None) CONFIG.setTextFont(None) From 14f16974281009552106333d4689bb0978d076c6 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 16 Jun 2024 11:23:59 +0200 Subject: [PATCH 12/67] Rename lastPath in build settings --- novelwriter/core/buildsettings.py | 6 ++--- novelwriter/tools/manusbuild.py | 6 ++--- tests/test_core/test_core_buildsettings.py | 28 +++++++++++----------- tests/test_tools/test_tools_manusbuild.py | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/novelwriter/core/buildsettings.py b/novelwriter/core/buildsettings.py index 72fd395b..3ceee536 100644 --- a/novelwriter/core/buildsettings.py +++ b/novelwriter/core/buildsettings.py @@ -219,7 +219,7 @@ class BuildSettings: return self._order @property - def lastPath(self) -> Path: + def lastBuildPath(self) -> Path: """The last used build path.""" if self._path.is_dir(): return self._path @@ -293,7 +293,7 @@ class BuildSettings: self._order = value return - def setLastPath(self, path: Path | str | None) -> None: + def setLastBuildPath(self, path: Path | str | None) -> None: """Set the last used build path.""" if isinstance(path, str): path = Path(path) @@ -461,7 +461,7 @@ class BuildSettings: self.setName(data.get("name", "")) self.setBuildID(data.get("uuid", "")) self.setOrder(data.get("order", 0)) - self.setLastPath(data.get("path", None)) + self.setLastBuildPath(data.get("path", None)) self.setLastBuildName(data.get("build", "")) buildFmt = str(data.get("format", "")) diff --git a/novelwriter/tools/manusbuild.py b/novelwriter/tools/manusbuild.py index a8f2f7c2..d87b9be2 100644 --- a/novelwriter/tools/manusbuild.py +++ b/novelwriter/tools/manusbuild.py @@ -220,7 +220,7 @@ class GuiManuscriptBuild(NDialog): self.btnBuild.setFocus() self._populateContentList() - self.buildPath.setText(str(self._build.lastPath)) + self.buildPath.setText(str(self._build.lastBuildPath)) if self._build.lastBuildName: self.buildName.setText(self._build.lastBuildName) else: @@ -274,7 +274,7 @@ class GuiManuscriptBuild(NDialog): def _doSelectPath(self) -> None: """Select a folder for output.""" bPath = Path(self.buildPath.text()) - bPath = bPath if bPath.is_dir() else self._build.lastPath + bPath = bPath if bPath.is_dir() else self._build.lastBuildPath savePath = QFileDialog.getExistingDirectory( self, self.tr("Select Folder"), str(bPath) ) @@ -336,7 +336,7 @@ class GuiManuscriptBuild(NDialog): for i, _ in docBuild.iterBuild(buildPath, bFormat): self.buildProgress.setValue(i+1) - self._build.setLastPath(bPath) + self._build.setLastBuildPath(bPath) self._build.setLastBuildName(bName) self._build.setLastFormat(bFormat) diff --git a/tests/test_core/test_core_buildsettings.py b/tests/test_core/test_core_buildsettings.py index d08bd6c4..b1308ea7 100644 --- a/tests/test_core/test_core_buildsettings.py +++ b/tests/test_core/test_core_buildsettings.py @@ -73,29 +73,29 @@ def testCoreBuildSettings_ClassAttributes(fncPath: Path): assert isUUID(build.buildID) # Last path must be valid, if not it defaults to $HOME - build.setLastPath("/path/to/nowhere") - assert build.lastPath == CONFIG.homePath() + build.setLastBuildPath("/path/to/nowhere") + assert build.lastBuildPath == CONFIG.homePath() - build.setLastPath(None) - assert build.lastPath == CONFIG.homePath() + build.setLastBuildPath(None) + assert build.lastBuildPath == CONFIG.homePath() (fncPath / "test.txt").write_text("foobar") - build.setLastPath(fncPath / "test.txt") # Can't be a file - assert build.lastPath == CONFIG.homePath() + build.setLastBuildPath(fncPath / "test.txt") # Can't be a file + assert build.lastBuildPath == CONFIG.homePath() - build.setLastPath(fncPath) - assert build.lastPath == fncPath + build.setLastBuildPath(fncPath) + assert build.lastBuildPath == fncPath - build.setLastPath(str(fncPath)) # String paths are also ok - assert build.lastPath == fncPath + build.setLastBuildPath(str(fncPath)) # String paths are also ok + assert build.lastBuildPath == fncPath # Last path no longer exists -> fallback to $HOME testDir = fncPath / "test_dir" testDir.mkdir() - build.setLastPath(testDir) - assert build.lastPath == testDir + build.setLastBuildPath(testDir) + assert build.lastBuildPath == testDir testDir.rmdir() - assert build.lastPath == CONFIG.homePath() + assert build.lastBuildPath == CONFIG.homePath() # Last build name build.setLastBuildName(None) # type: ignore @@ -119,7 +119,7 @@ def testCoreBuildSettings_ClassAttributes(fncPath: Path): # Set some sensible values build.setName("Test Build") build.setBuildID("5cf45d24-f496-42c9-8733-529a9e52a62b") - build.setLastPath(fncPath) + build.setLastBuildPath(fncPath) build.setLastBuildName("Build Name") build.setLastFormat(nwBuildFmt.HTML) diff --git a/tests/test_tools/test_tools_manusbuild.py b/tests/test_tools/test_tools_manusbuild.py index eb1685aa..b6e22edc 100644 --- a/tests/test_tools/test_tools_manusbuild.py +++ b/tests/test_tools/test_tools_manusbuild.py @@ -47,7 +47,7 @@ def testToolManuscriptBuild_Main( buildTestProject(nwGUI, projPath) nwGUI.openProject(projPath) build = BuildSettings() - build.setLastPath(fncPath) + build.setLastBuildPath(fncPath) manus = GuiManuscriptBuild(nwGUI, build) manus.show() @@ -100,7 +100,7 @@ def testToolManuscriptBuild_Main( assert build.lastBuildName == "TestBuild" assert build.lastFormat == lastFmt - assert build.lastPath == fncPath + assert build.lastBuildPath == fncPath # Error Handling # ============== From ac05b07f106149cca4dceb48130bd343d2750e24 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 16 Jun 2024 15:05:45 +0200 Subject: [PATCH 13/67] Add line height formatting to build preview (#1920) --- novelwriter/core/toqdoc.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/novelwriter/core/toqdoc.py b/novelwriter/core/toqdoc.py index fc7d3b46..493c4898 100644 --- a/novelwriter/core/toqdoc.py +++ b/novelwriter/core/toqdoc.py @@ -136,6 +136,9 @@ class ToQTextDocument(Tokenizer): self._blockFmt.setTopMargin(self._mText[0]) self._blockFmt.setBottomMargin(self._mText[1]) self._blockFmt.setAlignment(QtAlignJustify if self._doJustify else QtAlignAbsolute) + self._blockFmt.setLineHeight( + 100*self._lineHeight, QTextBlockFormat.LineHeightTypes.ProportionalHeight + ) # Character Formats # ================= From 7c33c949cbdeae8923d6d9e02801f269faf3b1d8 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 16 Jun 2024 15:23:22 +0200 Subject: [PATCH 14/67] Merge the two methods in the shared class to save editor content --- novelwriter/gui/projtree.py | 6 +++--- novelwriter/gui/search.py | 2 +- novelwriter/shared.py | 27 ++++++++++----------------- novelwriter/tools/manusbuild.py | 2 +- novelwriter/tools/manuscript.py | 2 +- 5 files changed, 16 insertions(+), 23 deletions(-) diff --git a/novelwriter/gui/projtree.py b/novelwriter/gui/projtree.py index 551ad6e6..f6e897cb 100644 --- a/novelwriter/gui/projtree.py +++ b/novelwriter/gui/projtree.py @@ -997,7 +997,7 @@ class GuiProjectTree(QTreeWidget): trItemP.takeChild(tIndex) for dHandle in reversed(self.getTreeFromHandle(tHandle)): - SHARED.closeDocument(dHandle) + SHARED.closeEditor(dHandle) SHARED.project.removeItem(dHandle) self._treeMap.pop(dHandle, None) @@ -1404,7 +1404,7 @@ class GuiProjectTree(QTreeWidget): return False # Save the open document first, in case it's part of merge - SHARED.saveDocument() + SHARED.saveEditor() # Create merge object, and append docs docMerger = DocMerger(SHARED.project) @@ -1805,7 +1805,7 @@ class _TreeContextMenu(QMenu): def _itemHeader(self) -> None: """Check if there is a header that can be used for rename.""" - SHARED.ensureEditorSaved(self._handle) + SHARED.saveEditor() if hItem := SHARED.project.index.getItemHeading(self._handle, "T0001"): action = self.addAction(self.tr("Rename to Heading")) action.triggered.connect( diff --git a/novelwriter/gui/search.py b/novelwriter/gui/search.py index f19c419d..d89d04eb 100644 --- a/novelwriter/gui/search.py +++ b/novelwriter/gui/search.py @@ -259,7 +259,7 @@ class GuiProjectSearch(QWidget): if not self._blocked: QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor)) start = time() - SHARED.saveDocument() + SHARED.saveEditor() self._blocked = True self._map = {} self.searchResult.clear() diff --git a/novelwriter/shared.py b/novelwriter/shared.py index 95c59068..130019d2 100644 --- a/novelwriter/shared.py +++ b/novelwriter/shared.py @@ -172,15 +172,21 @@ class SharedData(QObject): logger.debug("Thread Pool Max Count: %d", QThreadPool.globalInstance().maxThreadCount()) return - def closeDocument(self, tHandle: str | None = None) -> None: + def closeEditor(self, tHandle: str | None = None) -> None: """Close the document editor, optionally a specific document.""" if tHandle is None or tHandle == self.mainGui.docEditor.docHandle: self.mainGui.closeDocument() return - def saveDocument(self) -> None: - """Forward save document call to main GUI.""" - self.mainGui.saveDocument() + def saveEditor(self, tHandle: str | None = None) -> None: + """Save editor content, optionally a specific document.""" + docEditor = self.mainGui.docEditor + if ( + self.hasProject and docEditor.docHandle + and (tHandle is None or tHandle == docEditor.docHandle) + ): + logger.debug("Saving editor document before action") + docEditor.saveText() return def openProject(self, path: str | Path, clearLock: bool = False) -> bool: @@ -216,19 +222,6 @@ class SharedData(QObject): self._resetIdleTimer() return - def ensureEditorSaved(self, tHandle: str | None) -> None: - """Ensure that the editor content is saved. Optionally, only if - it is a specific handle. - """ - docEditor = self.mainGui.docEditor - if ( - self.hasProject and docEditor.docHandle - and (tHandle is None or tHandle == docEditor.docHandle) - ): - logger.debug("Saving editor document before action") - docEditor.saveText() - return - def updateSpellCheckLanguage(self, reload: bool = False) -> None: """Update the active spell check language from settings.""" from novelwriter import CONFIG diff --git a/novelwriter/tools/manusbuild.py b/novelwriter/tools/manusbuild.py index d87b9be2..90f6f296 100644 --- a/novelwriter/tools/manusbuild.py +++ b/novelwriter/tools/manusbuild.py @@ -327,7 +327,7 @@ class GuiManuscriptBuild(NDialog): return False # Make sure editor content is saved before we start - SHARED.saveDocument() + SHARED.saveEditor() docBuild = NWBuildDocument(SHARED.project, self._build) docBuild.queueAll() diff --git a/novelwriter/tools/manuscript.py b/novelwriter/tools/manuscript.py index fba899a8..53f3a17b 100644 --- a/novelwriter/tools/manuscript.py +++ b/novelwriter/tools/manuscript.py @@ -325,7 +325,7 @@ class GuiManuscript(NToolDialog): start = time() # Make sure editor content is saved before we start - SHARED.ensureEditorSaved(None) + SHARED.saveEditor() docBuild = NWBuildDocument(SHARED.project, build) docBuild.queueAll() From ee46fdb5b190880040b0575f997fb8afc80e1c64 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 16 Jun 2024 15:27:46 +0200 Subject: [PATCH 15/67] Refresh global search when toggling settings, if there is a search --- novelwriter/gui/search.py | 9 +++++++++ novelwriter/shared.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/novelwriter/gui/search.py b/novelwriter/gui/search.py index d89d04eb..65f23a44 100644 --- a/novelwriter/gui/search.py +++ b/novelwriter/gui/search.py @@ -208,6 +208,12 @@ class GuiProjectSearch(QWidget): self.searchResult.clear() return + def refreshCurrentSearch(self) -> None: + """Refresh the search if there is one.""" + if self.searchResult.topLevelItemCount() > 0: + self._processSearch() + return + ## # Events ## @@ -298,18 +304,21 @@ class GuiProjectSearch(QWidget): def _toggleCase(self, state: bool) -> None: """Enable/disable case sensitive mode.""" CONFIG.searchProjCase = state + self.refreshCurrentSearch() return @pyqtSlot(bool) def _toggleWord(self, state: bool) -> None: """Enable/disable whole word search mode.""" CONFIG.searchProjWord = state + self.refreshCurrentSearch() return @pyqtSlot(bool) def _toggleRegEx(self, state: bool) -> None: """Enable/disable regular expression search mode.""" CONFIG.searchProjRegEx = state + self.refreshCurrentSearch() return ## diff --git a/novelwriter/shared.py b/novelwriter/shared.py index 130019d2..2c8f9ce3 100644 --- a/novelwriter/shared.py +++ b/novelwriter/shared.py @@ -179,7 +179,7 @@ class SharedData(QObject): return def saveEditor(self, tHandle: str | None = None) -> None: - """Save editor content, optionally a specific document.""" + """Save the editor content, optionally a specific document.""" docEditor = self.mainGui.docEditor if ( self.hasProject and docEditor.docHandle From 611a6bb80a4a798a7dfe6004094537d58f504e6a Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 16 Jun 2024 15:58:30 +0200 Subject: [PATCH 16/67] Include the whole word when displaying search results --- novelwriter/core/coretools.py | 4 +++- tests/test_core/test_core_coretools.py | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/novelwriter/core/coretools.py b/novelwriter/core/coretools.py index eb113a5d..08b96957 100644 --- a/novelwriter/core/coretools.py +++ b/novelwriter/core/coretools.py @@ -348,7 +348,9 @@ class DocSearch: rxMatch = rxItt.next() pos = rxMatch.capturedStart() num = rxMatch.capturedLength() - context = text[pos:pos+100].partition("\n")[0] + lim = text[:pos].rfind("\n") + 1 + cut = text[lim:pos].rfind(" ") + lim + 1 + context = text[cut:cut+100].partition("\n")[0] if context: results.append((pos, num, context)) count += 1 diff --git a/tests/test_core/test_core_coretools.py b/tests/test_core/test_core_coretools.py index a0aa86e0..fb5ef0c3 100644 --- a/tests/test_core/test_core_coretools.py +++ b/tests/test_core/test_core_coretools.py @@ -439,6 +439,7 @@ def testCoreTools_DocSearch(monkeypatch, mockGUI, fncPath, mockRnd, ipsumText): return [(s, n, c.split()[0]) for s, n, c in temp] # Defaults + # assert list(search.iterSearch(project, "Lorem")) == [] assert pruneResult(search.iterSearch(project, "Lorem"), 2) == [ (15, 5, "Lorem"), (754, 5, "lorem"), (2056, 5, "lorem,"), (2209, 5, "lorem"), (2425, 5, "lorem"), (2840, 5, "lorem."), (3399, 5, "lorem"), @@ -449,8 +450,8 @@ def testCoreTools_DocSearch(monkeypatch, mockGUI, fncPath, mockRnd, ipsumText): assert pruneResult(search.iterSearch(project, "Lor"), 2) == [] search.setWholeWords(False) assert pruneResult(search.iterSearch(project, "Lor"), 2) == [ - (15, 3, "Lorem"), (29, 3, "lor"), (754, 3, "lorem"), (2056, 3, "lorem,"), - (2209, 3, "lorem"), (2425, 3, "lorem"), (2840, 3, "lorem."), (3328, 3, "lor."), + (15, 3, "Lorem"), (29, 3, "dolor"), (754, 3, "lorem"), (2056, 3, "lorem,"), + (2209, 3, "lorem"), (2425, 3, "lorem"), (2840, 3, "lorem."), (3328, 3, "dolor."), (3399, 3, "lorem"), ] @@ -458,7 +459,7 @@ def testCoreTools_DocSearch(monkeypatch, mockGUI, fncPath, mockRnd, ipsumText): search.setWholeWords(False) search.setUserRegEx(True) assert pruneResult(search.iterSearch(project, r"Lor\b"), 2) == [ - (29, 3, "lor"), (3328, 3, "lor."), + (29, 3, "dolor"), (3328, 3, "dolor."), ] # Max Results From 59c978339382b435697f74293de6abef9073699e Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 16 Jun 2024 16:03:35 +0200 Subject: [PATCH 17/67] Remove commented out line --- tests/test_core/test_core_coretools.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_core/test_core_coretools.py b/tests/test_core/test_core_coretools.py index fb5ef0c3..faf11cfc 100644 --- a/tests/test_core/test_core_coretools.py +++ b/tests/test_core/test_core_coretools.py @@ -439,7 +439,6 @@ def testCoreTools_DocSearch(monkeypatch, mockGUI, fncPath, mockRnd, ipsumText): return [(s, n, c.split()[0]) for s, n, c in temp] # Defaults - # assert list(search.iterSearch(project, "Lorem")) == [] assert pruneResult(search.iterSearch(project, "Lorem"), 2) == [ (15, 5, "Lorem"), (754, 5, "lorem"), (2056, 5, "lorem,"), (2209, 5, "lorem"), (2425, 5, "lorem"), (2840, 5, "lorem."), (3399, 5, "lorem"), From 43cdc8420c56d937b8497a436017d42758393f0e Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 16 Jun 2024 16:14:11 +0200 Subject: [PATCH 18/67] Merge progress bars into single source file --- .../{circularprogress.py => progressbars.py} | 29 ++++++++-- novelwriter/extensions/simpleprogress.py | 53 ------------------- novelwriter/tools/manusbuild.py | 2 +- novelwriter/tools/manuscript.py | 2 +- 4 files changed, 28 insertions(+), 58 deletions(-) rename novelwriter/extensions/{circularprogress.py => progressbars.py} (79%) delete mode 100644 novelwriter/extensions/simpleprogress.py diff --git a/novelwriter/extensions/circularprogress.py b/novelwriter/extensions/progressbars.py similarity index 79% rename from novelwriter/extensions/circularprogress.py rename to novelwriter/extensions/progressbars.py index de360d82..60e2b356 100644 --- a/novelwriter/extensions/circularprogress.py +++ b/novelwriter/extensions/progressbars.py @@ -1,9 +1,10 @@ """ -novelWriter – Custom Widget: Progress Circle -============================================ +novelWriter – Custom Widget: Progress Bars +========================================== File History: -Created: 2023-06-07 [2.1b1] +Created: 2023-06-07 [2.1b1] NProgressCircle +Created: 2023-06-09 [2.1b1] NProgressSimple This file is a part of novelWriter Copyright 2018–2024, Veronica Berglyd Olsen @@ -101,3 +102,25 @@ class NProgressCircle(QProgressBar): painter.setPen(self._tColor) painter.drawText(self._cRect, QtAlignCenter, self._text or f"{progress:.1f} %") return + + +class NProgressSimple(QProgressBar): + """Extension: Simple Progress Widget + + A custom widget that paints a plain bar with no other styling. + """ + + def __init__(self, parent: QWidget) -> None: + super().__init__(parent=parent) + return + + def paintEvent(self, event: QPaintEvent) -> None: + """Custom painter for the progress bar.""" + if (value := self.value()) > 0: + progress = ceil(self.width()*float(value)/self.maximum()) + painter = QPainter(self) + painter.setRenderHint(QtPaintAnitAlias, True) + painter.setPen(self.palette().highlight().color()) + painter.setBrush(self.palette().highlight()) + painter.drawRect(0, 0, progress, self.height()) + return diff --git a/novelwriter/extensions/simpleprogress.py b/novelwriter/extensions/simpleprogress.py deleted file mode 100644 index f940c73c..00000000 --- a/novelwriter/extensions/simpleprogress.py +++ /dev/null @@ -1,53 +0,0 @@ -""" -novelWriter – Custom Widget: Progress Simple -============================================ - -File History: -Created: 2023-06-09 [2.1b1] - -This file is a part of novelWriter -Copyright 2018–2024, Veronica Berglyd Olsen - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -""" -from __future__ import annotations - -from math import ceil - -from PyQt5.QtGui import QPainter, QPaintEvent -from PyQt5.QtWidgets import QProgressBar, QWidget - -from novelwriter.types import QtPaintAnitAlias - - -class NProgressSimple(QProgressBar): - """Extension: Simple Progress Widget - - A custom widget that paints a plain bar with no other styling. - """ - - def __init__(self, parent: QWidget) -> None: - super().__init__(parent=parent) - return - - def paintEvent(self, event: QPaintEvent) -> None: - """Custom painter for the progress bar.""" - if (value := self.value()) > 0: - progress = ceil(self.width()*float(value)/self.maximum()) - painter = QPainter(self) - painter.setRenderHint(QtPaintAnitAlias, True) - painter.setPen(self.palette().highlight().color()) - painter.setBrush(self.palette().highlight()) - painter.drawRect(0, 0, progress, self.height()) - return diff --git a/novelwriter/tools/manusbuild.py b/novelwriter/tools/manusbuild.py index 90f6f296..cf18822b 100644 --- a/novelwriter/tools/manusbuild.py +++ b/novelwriter/tools/manusbuild.py @@ -43,7 +43,7 @@ from novelwriter.core.docbuild import NWBuildDocument from novelwriter.core.item import NWItem from novelwriter.enum import nwBuildFmt from novelwriter.extensions.modified import NDialog, NIconToolButton -from novelwriter.extensions.simpleprogress import NProgressSimple +from novelwriter.extensions.progressbars import NProgressSimple from novelwriter.types import QtAlignCenter, QtDialogClose, QtRoleAction, QtRoleReject, QtUserRole logger = logging.getLogger(__name__) diff --git a/novelwriter/tools/manuscript.py b/novelwriter/tools/manuscript.py index 53f3a17b..4c216742 100644 --- a/novelwriter/tools/manuscript.py +++ b/novelwriter/tools/manuscript.py @@ -44,8 +44,8 @@ from novelwriter.core.buildsettings import BuildCollection, BuildSettings from novelwriter.core.docbuild import NWBuildDocument from novelwriter.core.tokenizer import HeadingFormatter from novelwriter.core.toqdoc import TextDocumentTheme, ToQTextDocument -from novelwriter.extensions.circularprogress import NProgressCircle from novelwriter.extensions.modified import NIconToggleButton, NIconToolButton, NToolDialog +from novelwriter.extensions.progressbars import NProgressCircle from novelwriter.gui.theme import STYLES_FLAT_TABS, STYLES_MIN_TOOLBUTTON from novelwriter.tools.manusbuild import GuiManuscriptBuild from novelwriter.tools.manussettings import GuiBuildSettings From 53522908c8f938a5a2c2ef48eeba2b0a608e5bbd Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 16 Jun 2024 17:29:29 +0200 Subject: [PATCH 19/67] Improve test coverage --- tests/test_ext/test_ext_progressbars.py | 78 +++++++++++++++++++++++++ tests/test_ext/test_ext_switch.py | 74 +++++++++++++++++++++++ tests/tools.py | 14 +++-- 3 files changed, 161 insertions(+), 5 deletions(-) create mode 100644 tests/test_ext/test_ext_progressbars.py create mode 100644 tests/test_ext/test_ext_switch.py diff --git a/tests/test_ext/test_ext_progressbars.py b/tests/test_ext/test_ext_progressbars.py new file mode 100644 index 00000000..66477feb --- /dev/null +++ b/tests/test_ext/test_ext_progressbars.py @@ -0,0 +1,78 @@ +""" +novelWriter – Progress Bar Tester +================================= + +This file is a part of novelWriter +Copyright 2018–2024, Veronica Berglyd Olsen + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +""" +from __future__ import annotations + +from time import sleep + +import pytest + +from PyQt5.QtGui import QColor + +from novelwriter.extensions.progressbars import NProgressCircle, NProgressSimple + +from tests.tools import SimpleDialog + + +@pytest.mark.gui +def testExtProgressBars_NProgressCircle(qtbot): + """Test the NProgressCircle class.""" + dialog = SimpleDialog() + progress = NProgressCircle(dialog, 200, 16) + + with qtbot.waitExposed(dialog): + # This ensures the paint event is executed + dialog.show() + + dialog.resize(200, 200) + progress.setColours( + QColor(255, 255, 255), QColor(255, 192, 192), + QColor(255, 0, 0), QColor(0, 0, 0), + ) + + progress.setMaximum(100) + for i in range(1, 101): + progress.setValue(i) + sleep(0.0025) + assert progress.value() == i + + progress.setCentreText("Done!") + assert progress._text == "Done!" + + # qtbot.stop() + + +@pytest.mark.gui +def testExtProgressBars_NProgressSimple(qtbot): + """Test the NProgressSimple class.""" + dialog = SimpleDialog() + progress = NProgressSimple(dialog) + + with qtbot.waitExposed(dialog): + # This ensures the paint event is executed + dialog.show() + + progress.setMaximum(100) + for i in range(1, 101): + progress.setValue(i) + sleep(0.0025) + assert progress.value() == i + + # qtbot.stop() diff --git a/tests/test_ext/test_ext_switch.py b/tests/test_ext/test_ext_switch.py new file mode 100644 index 00000000..6268721e --- /dev/null +++ b/tests/test_ext/test_ext_switch.py @@ -0,0 +1,74 @@ +""" +novelWriter – Switch Tester +=========================== + +This file is a part of novelWriter +Copyright 2018–2024, Veronica Berglyd Olsen + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +""" +from __future__ import annotations + +import pytest + +from PyQt5.QtCore import QEvent, QPoint +from PyQt5.QtGui import QMouseEvent + +from novelwriter.extensions.switch import NSwitch +from novelwriter.types import QtModNone, QtMouseLeft + +from tests.tools import SimpleDialog + + +@pytest.mark.gui +def testExtSwitch_Main(qtbot): + """Test the NSwitch class. This is mostly a check that all the calls + work as the result is visual. + """ + dialog = SimpleDialog() + switch = NSwitch(dialog, 40) + + with qtbot.waitExposed(dialog): + # This ensures the paint event is executed + dialog.show() + + dialog.resize(200, 100) + + switch.setEnabled(False) + switch.setChecked(False) + switch.repaint() + qtbot.wait(20) + + switch.setChecked(True) + switch.repaint() + qtbot.wait(20) + + switch.setEnabled(True) + switch.setChecked(False) + switch.repaint() + qtbot.wait(20) + + switch.setChecked(True) + switch.repaint() + qtbot.wait(20) + + button = QtMouseLeft + modifier = QtModNone + event = QMouseEvent(QEvent.Type.MouseButtonRelease, QPoint(), button, button, modifier) + switch.mouseReleaseEvent(event) + + event = QEvent(QEvent.Type.Enter) + switch.enterEvent(event) + + # qtbot.stop() diff --git a/tests/tools.py b/tests/tools.py index 1d62562d..072b2313 100644 --- a/tests/tools.py +++ b/tests/tools.py @@ -204,17 +204,21 @@ def buildTestProject(obj: object, projPath: Path) -> None: class SimpleDialog(QDialog): - def __init__(self, widget: QWidget) -> None: + def __init__(self, widget: QWidget | None = None) -> None: super().__init__() self._widget = widget - layout = QVBoxLayout() - layout.addWidget(widget) layout.setContentsMargins(40, 40, 40, 40) self.setLayout(layout) - + if widget: + layout.addWidget(widget) return @property - def widget(self) -> QWidget: + def widget(self) -> QWidget | None: return self._widget + + def addWidget(self, widget: QWidget) -> None: + self._widget = widget + self.layout().addWidget(widget) + return From 683e81c57bfff9b685c34e0babec8e13f94834a2 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 16 Jun 2024 21:13:50 +0200 Subject: [PATCH 20/67] Connect rehighlight tags in editor to index signal on tags change (#1916) --- novelwriter/gui/doceditor.py | 12 +++++++----- novelwriter/guimain.py | 2 +- tests/test_gui/test_gui_doceditor.py | 1 - 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/novelwriter/gui/doceditor.py b/novelwriter/gui/doceditor.py index 6581d601..b54df758 100644 --- a/novelwriter/gui/doceditor.py +++ b/novelwriter/gui/doceditor.py @@ -436,11 +436,6 @@ class GuiDocEditor(QPlainTextEdit): return True - def updateTagHighLighting(self) -> None: - """Rerun the syntax highlighter on all meta data lines.""" - self._qDocument.syntaxHighlighter.rehighlightByType(BLOCK_META) - return - def replaceText(self, text: str) -> None: """Replace the text of the current document with the provided text. This also clears undo history. @@ -1034,6 +1029,13 @@ class GuiDocEditor(QPlainTextEdit): self.beginSearch() return + @pyqtSlot(list, list) + def updateChangedTags(self, updated: list[str], deleted: list[str]) -> None: + """Tags have changed, so just in case we rehighlight them.""" + if updated or deleted: + self._qDocument.syntaxHighlighter.rehighlightByType(BLOCK_META) + return + ## # Private Slots ## diff --git a/novelwriter/guimain.py b/novelwriter/guimain.py index ed4b1650..f23d2b4b 100644 --- a/novelwriter/guimain.py +++ b/novelwriter/guimain.py @@ -215,6 +215,7 @@ class GuiMain(QMainWindow): SHARED.spellLanguageChanged.connect(self.mainStatus.setLanguage) SHARED.focusModeChanged.connect(self._focusModeChanged) SHARED.indexChangedTags.connect(self.docViewerPanel.updateChangedTags) + SHARED.indexChangedTags.connect(self.docEditor.updateChangedTags) SHARED.indexScannedText.connect(self.docViewerPanel.projectItemChanged) SHARED.indexScannedText.connect(self.projView.updateItemValues) SHARED.indexScannedText.connect(self.itemDetails.updateViewBox) @@ -745,7 +746,6 @@ class GuiMain(QMainWindow): self.mainStatus.setStatusMessage( self.tr("Indexing completed in {0} ms").format(f"{(tEnd - tStart)*1000.0:.1f}") ) - self.docEditor.updateTagHighLighting() self._updateStatusWordCount() QApplication.restoreOverrideCursor() diff --git a/tests/test_gui/test_gui_doceditor.py b/tests/test_gui/test_gui_doceditor.py index 6c8ed7a6..2ed80e96 100644 --- a/tests/test_gui/test_gui_doceditor.py +++ b/tests/test_gui/test_gui_doceditor.py @@ -1597,7 +1597,6 @@ def testGuiEditor_Tags(qtbot, nwGUI, projPath, ipsumText, mockRnd): docEditor.replaceText(text) nwGUI.saveDocument() assert nwGUI.projView.projTree.revealNewTreeItem(cHandle) - docEditor.updateTagHighLighting() # Follow Tag # ========== From efc94a7fd54bc5bdd89d517c2ce549420139b92f Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 16 Jun 2024 21:18:41 +0200 Subject: [PATCH 21/67] Sort signals in main GUI --- novelwriter/guimain.py | 60 +++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/novelwriter/guimain.py b/novelwriter/guimain.py index f23d2b4b..ec549b5c 100644 --- a/novelwriter/guimain.py +++ b/novelwriter/guimain.py @@ -210,18 +210,18 @@ class GuiMain(QMainWindow): # Connect Signals # =============== + SHARED.focusModeChanged.connect(self._focusModeChanged) + SHARED.indexAvailable.connect(self.docViewerPanel.indexHasAppeared) + SHARED.indexChangedTags.connect(self.docEditor.updateChangedTags) + SHARED.indexChangedTags.connect(self.docViewerPanel.updateChangedTags) + SHARED.indexCleared.connect(self.docViewerPanel.indexWasCleared) + SHARED.indexScannedText.connect(self.docViewerPanel.projectItemChanged) + SHARED.indexScannedText.connect(self.itemDetails.updateViewBox) + SHARED.indexScannedText.connect(self.projView.updateItemValues) + SHARED.mainClockTick.connect(self._timeTick) SHARED.projectStatusChanged.connect(self.mainStatus.updateProjectStatus) SHARED.projectStatusMessage.connect(self.mainStatus.setStatusMessage) SHARED.spellLanguageChanged.connect(self.mainStatus.setLanguage) - SHARED.focusModeChanged.connect(self._focusModeChanged) - SHARED.indexChangedTags.connect(self.docViewerPanel.updateChangedTags) - SHARED.indexChangedTags.connect(self.docEditor.updateChangedTags) - SHARED.indexScannedText.connect(self.docViewerPanel.projectItemChanged) - SHARED.indexScannedText.connect(self.projView.updateItemValues) - SHARED.indexScannedText.connect(self.itemDetails.updateViewBox) - SHARED.indexCleared.connect(self.docViewerPanel.indexWasCleared) - SHARED.indexAvailable.connect(self.docViewerPanel.indexHasAppeared) - SHARED.mainClockTick.connect(self._timeTick) self.mainMenu.requestDocAction.connect(self._passDocumentAction) self.mainMenu.requestDocInsert.connect(self._passDocumentInsert) @@ -232,46 +232,46 @@ class GuiMain(QMainWindow): self.sideBar.requestViewChange.connect(self._changeView) - self.projView.selectedItemChanged.connect(self.itemDetails.updateViewBox) self.projView.openDocumentRequest.connect(self._openDocument) - self.projView.wordCountsChanged.connect(self._updateStatusWordCount) + self.projView.projectSettingsRequest.connect(self.showProjectSettingsDialog) + self.projView.rootFolderChanged.connect(self.novelView.updateRootItem) + self.projView.rootFolderChanged.connect(self.outlineView.updateRootItem) + self.projView.rootFolderChanged.connect(self.projView.updateRootItem) + self.projView.selectedItemChanged.connect(self.itemDetails.updateViewBox) self.projView.treeItemChanged.connect(self.docEditor.updateDocInfo) self.projView.treeItemChanged.connect(self.docViewer.updateDocInfo) - self.projView.treeItemChanged.connect(self.itemDetails.updateViewBox) self.projView.treeItemChanged.connect(self.docViewerPanel.projectItemChanged) - self.projView.rootFolderChanged.connect(self.outlineView.updateRootItem) - self.projView.rootFolderChanged.connect(self.novelView.updateRootItem) - self.projView.rootFolderChanged.connect(self.projView.updateRootItem) - self.projView.projectSettingsRequest.connect(self.showProjectSettingsDialog) + self.projView.treeItemChanged.connect(self.itemDetails.updateViewBox) + self.projView.wordCountsChanged.connect(self._updateStatusWordCount) - self.novelView.selectedItemChanged.connect(self.itemDetails.updateViewBox) self.novelView.openDocumentRequest.connect(self._openDocument) + self.novelView.selectedItemChanged.connect(self.itemDetails.updateViewBox) self.projSearch.openDocumentSelectRequest.connect(self._openDocumentSelection) self.projSearch.selectedItemChanged.connect(self.itemDetails.updateViewBox) - self.docEditor.editedStatusChanged.connect(self.mainStatus.updateDocumentStatus) + self.docEditor.closeDocumentRequest.connect(self.closeDocEditor) self.docEditor.docCountsChanged.connect(self.itemDetails.updateCounts) self.docEditor.docCountsChanged.connect(self.projView.updateCounts) - self.docEditor.loadDocumentTagRequest.connect(self._followTag) - self.docEditor.novelStructureChanged.connect(self.novelView.refreshTree) - self.docEditor.novelItemMetaChanged.connect(self.novelView.updateNovelItemMeta) - self.docEditor.statusMessage.connect(self.mainStatus.setStatusMessage) - self.docEditor.spellCheckStateChanged.connect(self.mainMenu.setSpellCheckState) - self.docEditor.closeDocumentRequest.connect(self.closeDocEditor) - self.docEditor.toggleFocusModeRequest.connect(self.toggleFocusMode) - self.docEditor.requestProjectItemSelected.connect(self.projView.setSelectedHandle) - self.docEditor.requestProjectItemRenamed.connect(self.projView.renameTreeItem) - self.docEditor.requestNewNoteCreation.connect(self.projView.createNewNote) self.docEditor.docTextChanged.connect(self.projSearch.textChanged) + self.docEditor.editedStatusChanged.connect(self.mainStatus.updateDocumentStatus) + self.docEditor.loadDocumentTagRequest.connect(self._followTag) + self.docEditor.novelItemMetaChanged.connect(self.novelView.updateNovelItemMeta) + self.docEditor.novelStructureChanged.connect(self.novelView.refreshTree) + self.docEditor.requestNewNoteCreation.connect(self.projView.createNewNote) self.docEditor.requestNextDocument.connect(self.openNextDocument) + self.docEditor.requestProjectItemRenamed.connect(self.projView.renameTreeItem) + self.docEditor.requestProjectItemSelected.connect(self.projView.setSelectedHandle) + self.docEditor.spellCheckStateChanged.connect(self.mainMenu.setSpellCheckState) + self.docEditor.statusMessage.connect(self.mainStatus.setStatusMessage) + self.docEditor.toggleFocusModeRequest.connect(self.toggleFocusMode) + self.docViewer.closeDocumentRequest.connect(self.closeDocViewer) self.docViewer.documentLoaded.connect(self.docViewerPanel.updateHandle) self.docViewer.loadDocumentTagRequest.connect(self._followTag) - self.docViewer.closeDocumentRequest.connect(self.closeDocViewer) self.docViewer.reloadDocumentRequest.connect(self._reloadViewer) - self.docViewer.togglePanelVisibility.connect(self._toggleViewerPanelVisibility) self.docViewer.requestProjectItemSelected.connect(self.projView.setSelectedHandle) + self.docViewer.togglePanelVisibility.connect(self._toggleViewerPanelVisibility) self.docViewerPanel.loadDocumentTagRequest.connect(self._followTag) self.docViewerPanel.openDocumentRequest.connect(self._openDocument) From 6540c566729d968f7ed8ec3cc5291db37643de55 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 16 Jun 2024 21:19:42 +0200 Subject: [PATCH 22/67] Remove no longer needed rehighlighting code --- novelwriter/gui/doceditor.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/novelwriter/gui/doceditor.py b/novelwriter/gui/doceditor.py index b54df758..5288b068 100644 --- a/novelwriter/gui/doceditor.py +++ b/novelwriter/gui/doceditor.py @@ -1924,8 +1924,6 @@ class GuiDocEditor(QPlainTextEdit): ).format(tag)): itemClass = nwKeyWords.KEY_CLASS.get(tBits[0], nwItemClass.NO_CLASS) self.requestNewNoteCreation.emit(tag, itemClass) - QApplication.processEvents() - self._qDocument.syntaxHighlighter.rehighlightBlock(block) return nwTrinary.POSITIVE if exist else nwTrinary.NEGATIVE From d25e2adfb67bc14a7db151eb02186e7a50256ac6 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 18 Jun 2024 08:39:28 +0200 Subject: [PATCH 23/67] Bump version to 2.5rc1 and update changelog --- CHANGELOG.md | 61 +++++++++++++++++++++++++++++++++++++++++ novelwriter/__init__.py | 6 ++-- sample/nwProject.nwx | 4 +-- 3 files changed, 66 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e451ab6..34c81310 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,66 @@ # novelWriter Changelog +## Version 2.5 RC 1 [2024-06-18] + +### Release Notes + +This is a release candidate of the next release version, and is intended for testing purposes. +Please be careful when using this version on live writing projects, and make sure you take frequent +backups. + +### Detailed Changelog + +**Bugfixes** + +* The Status bar LEDs are now properly updated when the theme changes. Issue #1893. PR #1906. +* All HTML tags are now properly closed at the end of each paragraph in HTML output. After + shortcodes were introduced, it was possible to leave formatting tags open. Issue #1919. PR #1926. + +**Improvements** + +* Move the first line indent setting from being an Open Document feature to a general build + settings feature that also applies to HTML, and make it visible in the Manuscript build tool + preview. Issue #1839 and #1858. PR #1898. +* Make sure the document in the editor is saved before the same document is opened in the viewer. + Issue #1884. PR #1902. +* The project name now appears before "novelWriter" in the main window title, which improves the + task bar label on at least Linux Mint Cinnamon, and Windows. Issue #1910. PR #1911. +* Dialogue highlighting now only applies to novel documents, not notes. It is also possible to + apply it to HTML and ODT manuscripts, and it also shows up in the preview and in the document + viewer. Issue #1774. PR #1908. +* The Welcome dialog and other tools that use the project name to generate files of folder names + are now less restrictive on what characters it allows in the file or folder names. Issue #1917. + PR #1922. +* Last used folder paths are now remembered individually for each tool or feature that requires + path input from the user. Issues #1930 and #1933. PR #1934. +* The Manuscript preview will now show line height as set in build settings. Issue #1920. PR #1935. +* Global search now refreshes if any of the search option buttons are toggled, and the search + result will show the complete word if the search term only matches part of a word. Issue #1830. + PR #1936. +* When a new note is created from a reference tag in the editor, the syntax highlighting is + properly updated to indicate the tag is now valid. Issue #1916. PR #1938. + +**Code Improvements** + +* Change how dialogs are handled in memory, and drop the calls to deleteLater for the underlying Qt + object as it caused problems in some cases. Instead, the dialog is disconnected from the parent + object, which seems to let the Python and Qt garbage collectors to kick in. + PRs #1899. #1913 and #1921. +* Overload the reject call for dialogs rather to call close, which the default implementation does + not. This simplifies the logic when closing dialogs, as reject() is also a slot, which close() is + not. Issue #1915. PR #1918. +* Processing of dialogue highlighting has been added to the Tokenizer class, and the RegEx handling + moved to a separate factory class. PR #1908. +* The progress bar widgets have been moved to a single module, and test coverage added. PR #1937. + +**Packaging** + +* The Windows installer is now built with Inno Setup 6.3, and uses zip compression rather than + lzma. It also properly sets the undelete icon, and the undelete process is better at cleaning up + files. PR #1932. + +---- + ## Version 2.5 Beta 1 [2024-05-26] ### Release Notes diff --git a/novelwriter/__init__.py b/novelwriter/__init__.py index 79156965..6dc0b942 100644 --- a/novelwriter/__init__.py +++ b/novelwriter/__init__.py @@ -47,9 +47,9 @@ __license__ = "GPLv3" __author__ = "Veronica Berglyd Olsen" __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" -__version__ = "2.5b1" -__hexversion__ = "0x020500b1" -__date__ = "2024-05-26" +__version__ = "2.5rc1" +__hexversion__ = "0x020500c1" +__date__ = "2024-06-18" __status__ = "Stable" __domain__ = "novelwriter.io" diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx index b85fea04..9c95fb37 100644 --- a/sample/nwProject.nwx +++ b/sample/nwProject.nwx @@ -1,6 +1,6 @@ - - + + Sample Project Jane Smith From f7d0adad1b86ed6aad04ba363d8c06d2748e39ff Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 18 Jun 2024 22:39:33 +0200 Subject: [PATCH 24/67] Shuffle around private slots in main GUI --- novelwriter/guimain.py | 18 +++++++++--------- tests/test_gui/test_gui_doceditor.py | 2 +- tests/test_gui/test_gui_guimain.py | 22 +++++++++++----------- tests/test_gui/test_gui_noveltree.py | 2 +- tests/test_gui/test_gui_projtree.py | 4 ++-- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/novelwriter/guimain.py b/novelwriter/guimain.py index ec549b5c..faee427b 100644 --- a/novelwriter/guimain.py +++ b/novelwriter/guimain.py @@ -227,7 +227,7 @@ class GuiMain(QMainWindow): self.mainMenu.requestDocInsert.connect(self._passDocumentInsert) self.mainMenu.requestDocInsertText.connect(self._passDocumentInsert) self.mainMenu.requestDocKeyWordInsert.connect(self.docEditor.insertKeyWord) - self.mainMenu.requestFocusChange.connect(self.switchFocus) + self.mainMenu.requestFocusChange.connect(self._switchFocus) self.mainMenu.requestViewChange.connect(self._changeView) self.sideBar.requestViewChange.connect(self._changeView) @@ -944,14 +944,18 @@ class GuiMain(QMainWindow): SHARED.setFocusMode(not SHARED.focusMode) return + ## + # Private Slots + ## + @pyqtSlot(bool) def _focusModeChanged(self, focusMode: bool) -> None: - """Handle change of focus mode. The Main GUI Focus Mode hides tree, - view, statusbar and menu. + """Handle change of focus mode. The Main GUI Focus Mode hides + tree, view, statusbar and menu. """ if focusMode: logger.debug("Activating Focus Mode") - self.switchFocus(nwWidget.EDITOR) + self._switchFocus(nwWidget.EDITOR) else: logger.debug("Deactivating Focus Mode") @@ -975,7 +979,7 @@ class GuiMain(QMainWindow): return @pyqtSlot(nwWidget) - def switchFocus(self, paneNo: nwWidget) -> None: + def _switchFocus(self, paneNo: nwWidget) -> None: """Switch focus between main GUI views.""" if paneNo == nwWidget.TREE: if self.projStack.currentWidget() is self.projView: @@ -1004,10 +1008,6 @@ class GuiMain(QMainWindow): self.outlineView.setTreeFocus() return - ## - # Private Slots - ## - @pyqtSlot(bool, bool, bool, bool) def _processConfigChanges(self, restart: bool, tree: bool, theme: bool, syntax: bool) -> None: """Refresh GUI based on flags from the Preferences dialog.""" diff --git a/tests/test_gui/test_gui_doceditor.py b/tests/test_gui/test_gui_doceditor.py index 2ed80e96..a35cc16c 100644 --- a/tests/test_gui/test_gui_doceditor.py +++ b/tests/test_gui/test_gui_doceditor.py @@ -1678,7 +1678,7 @@ def testGuiEditor_Completer(qtbot, nwGUI, projPath, mockRnd): completer = docEditor._completer # Create Scene - nwGUI.switchFocus(nwWidget.EDITOR) + nwGUI._switchFocus(nwWidget.EDITOR) for c in "### Scene One": qtbot.keyClick(docEditor, c, delay=KEY_DELAY) qtbot.keyClick(docEditor, Qt.Key_Return, delay=KEY_DELAY) diff --git a/tests/test_gui/test_gui_guimain.py b/tests/test_gui/test_gui_guimain.py index 4baf2758..1f011c37 100644 --- a/tests/test_gui/test_gui_guimain.py +++ b/tests/test_gui/test_gui_guimain.py @@ -113,7 +113,7 @@ def testGuiMain_ProjectTreeItems(qtbot, monkeypatch, nwGUI, projPath, mockRnd): # Project Tree has focus nwGUI._changeView(nwView.PROJECT) - nwGUI.switchFocus(nwWidget.TREE) + nwGUI._switchFocus(nwWidget.TREE) nwGUI.projStack.setCurrentIndex(0) with monkeypatch.context() as mp: mp.setattr(GuiProjectTree, "hasFocus", lambda *a: True) @@ -137,7 +137,7 @@ def testGuiMain_ProjectTreeItems(qtbot, monkeypatch, nwGUI, projPath, mockRnd): # Project Outline has focus nwGUI._changeView(nwView.OUTLINE) - nwGUI.switchFocus(nwWidget.OUTLINE) + nwGUI._switchFocus(nwWidget.OUTLINE) with monkeypatch.context() as mp: mp.setattr(GuiOutlineView, "treeHasFocus", lambda *a: True) assert nwGUI.docEditor.docHandle is None @@ -230,7 +230,7 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, projPath, tstPaths, mockRnd): CONFIG.autoScroll = True # Add a Character File - nwGUI.switchFocus(nwWidget.TREE) + nwGUI._switchFocus(nwWidget.TREE) nwGUI.projView.projTree.clearSelection() nwGUI.projView.projTree._getTreeItem(C.hCharRoot).setSelected(True) nwGUI.projView.projTree.newTreeItem(nwItemType.FILE, None, isNote=True) @@ -250,7 +250,7 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, projPath, tstPaths, mockRnd): docEditor._qDocument.syntaxHighlighter.initHighlighter() # Type something into the document - nwGUI.switchFocus(nwWidget.EDITOR) + nwGUI._switchFocus(nwWidget.EDITOR) qtbot.keyClick(docEditor, "a", modifier=Qt.ControlModifier, delay=KEY_DELAY) for c in "# Jane Doe": qtbot.keyClick(docEditor, c, delay=KEY_DELAY) @@ -265,14 +265,14 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, projPath, tstPaths, mockRnd): qtbot.keyClick(docEditor, Qt.Key_Return, delay=KEY_DELAY) # Add a Plot File - nwGUI.switchFocus(nwWidget.TREE) + nwGUI._switchFocus(nwWidget.TREE) nwGUI.projView.projTree.clearSelection() nwGUI.projView.projTree._getTreeItem(C.hPlotRoot).setSelected(True) nwGUI.projView.projTree.newTreeItem(nwItemType.FILE, None, isNote=True) nwGUI.openSelectedItem() # Type something into the document - nwGUI.switchFocus(nwWidget.EDITOR) + nwGUI._switchFocus(nwWidget.EDITOR) qtbot.keyClick(docEditor, "a", modifier=Qt.ControlModifier, delay=KEY_DELAY) for c in "# Main Plot": qtbot.keyClick(docEditor, c, delay=KEY_DELAY) @@ -287,7 +287,7 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, projPath, tstPaths, mockRnd): qtbot.keyClick(docEditor, Qt.Key_Return, delay=KEY_DELAY) # Add a World File - nwGUI.switchFocus(nwWidget.TREE) + nwGUI._switchFocus(nwWidget.TREE) nwGUI.projView.projTree.clearSelection() nwGUI.projView.projTree._getTreeItem(C.hWorldRoot).setSelected(True) nwGUI.projView.projTree.newTreeItem(nwItemType.FILE, None, isNote=True) @@ -299,7 +299,7 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, projPath, tstPaths, mockRnd): docEditor.replaceText("") # Type something into the document - nwGUI.switchFocus(nwWidget.EDITOR) + nwGUI._switchFocus(nwWidget.EDITOR) qtbot.keyClick(docEditor, "a", modifier=Qt.ControlModifier, delay=KEY_DELAY) for c in "# Main Location": qtbot.keyClick(docEditor, c, delay=KEY_DELAY) @@ -318,7 +318,7 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, projPath, tstPaths, mockRnd): nwGUI._autoSaveProject() # Select the 'New Scene' file - nwGUI.switchFocus(nwWidget.TREE) + nwGUI._switchFocus(nwWidget.TREE) nwGUI.projView.projTree.clearSelection() nwGUI.projView.projTree._getTreeItem(C.hNovelRoot).setExpanded(True) nwGUI.projView.projTree._getTreeItem(C.hChapterDir).setExpanded(True) @@ -326,7 +326,7 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, projPath, tstPaths, mockRnd): nwGUI.openSelectedItem() # Type something into the document - nwGUI.switchFocus(nwWidget.EDITOR) + nwGUI._switchFocus(nwWidget.EDITOR) qtbot.keyClick(docEditor, "a", modifier=Qt.ControlModifier, delay=KEY_DELAY) for c in "# Novel": qtbot.keyClick(docEditor, c, delay=KEY_DELAY) @@ -535,7 +535,7 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, projPath, tstPaths, mockRnd): nwGUI.rebuildIndex() # Open and view the edited document - nwGUI.switchFocus(nwWidget.VIEWER) + nwGUI._switchFocus(nwWidget.VIEWER) assert nwGUI.openDocument(C.hSceneDoc) assert nwGUI.viewDocument(C.hSceneDoc) assert nwGUI.saveProject() diff --git a/tests/test_gui/test_gui_noveltree.py b/tests/test_gui/test_gui_noveltree.py index 8878c540..593de829 100644 --- a/tests/test_gui/test_gui_noveltree.py +++ b/tests/test_gui/test_gui_noveltree.py @@ -44,7 +44,7 @@ def testGuiNovelTree_TreeItems(qtbot, monkeypatch, nwGUI, projPath, mockRnd): buildTestProject(nwGUI, projPath) - nwGUI.switchFocus(nwWidget.TREE) + nwGUI._switchFocus(nwWidget.TREE) nwGUI.projView.projTree.clearSelection() nwGUI.projView.projTree._getTreeItem(C.hCharRoot).setSelected(True) nwGUI.projView.projTree.newTreeItem(nwItemType.FILE) diff --git a/tests/test_gui/test_gui_projtree.py b/tests/test_gui/test_gui_projtree.py index 5d8b6923..8342150f 100644 --- a/tests/test_gui/test_gui_projtree.py +++ b/tests/test_gui/test_gui_projtree.py @@ -1111,7 +1111,7 @@ def testGuiProjTree_ContextMenu(qtbot, monkeypatch, nwGUI, projPath, mockRnd): # Create a project buildTestProject(nwGUI, projPath) nwGUI.openProject(projPath) - nwGUI.switchFocus(nwWidget.TREE) + nwGUI._switchFocus(nwWidget.TREE) # Handles for new objects hCharNote = "0000000000011" @@ -1408,7 +1408,7 @@ def testGuiProjTree_Templates(qtbot, monkeypatch, nwGUI, projPath, mockRnd): # Create a project buildTestProject(nwGUI, projPath) nwGUI.openProject(projPath) - nwGUI.switchFocus(nwWidget.TREE) + nwGUI._switchFocus(nwWidget.TREE) nwGUI.show() project = SHARED.project From 869cdd2fb0ab5465406c98cd10817bda14ffbd25 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 18 Jun 2024 22:41:29 +0200 Subject: [PATCH 25/67] Extend colour label widget to accept two colour states --- novelwriter/dialogs/about.py | 2 +- novelwriter/dialogs/docmerge.py | 2 +- novelwriter/dialogs/docsplit.py | 2 +- novelwriter/dialogs/preferences.py | 4 ++-- novelwriter/dialogs/projectsettings.py | 10 ++++----- novelwriter/dialogs/wordlist.py | 2 +- novelwriter/extensions/configlayout.py | 28 ++++++++++++++++++++++---- novelwriter/gui/outline.py | 2 +- novelwriter/tools/manussettings.py | 4 ++-- novelwriter/tools/noveldetails.py | 16 +++++++-------- 10 files changed, 46 insertions(+), 26 deletions(-) diff --git a/novelwriter/dialogs/about.py b/novelwriter/dialogs/about.py index 628c4e4e..25e0d2ef 100644 --- a/novelwriter/dialogs/about.py +++ b/novelwriter/dialogs/about.py @@ -75,7 +75,7 @@ class GuiAbout(NDialog): # Credits self.lblCredits = NColourLabel( - self.tr("Credits"), scale=1.6, parent=self, bold=True + self.tr("Credits"), self, scale=1.6, bold=True ) self.txtCredits = QTextBrowser(self) diff --git a/novelwriter/dialogs/docmerge.py b/novelwriter/dialogs/docmerge.py index 32b52a8d..d745dadb 100644 --- a/novelwriter/dialogs/docmerge.py +++ b/novelwriter/dialogs/docmerge.py @@ -58,7 +58,7 @@ class GuiDocMerge(NDialog): self.headLabel.setFont(SHARED.theme.guiFontB) self.helpLabel = NColourLabel( self.tr("Drag and drop items to change the order, or uncheck to exclude."), - SHARED.theme.helpText, parent=self, wrap=True + self, color=SHARED.theme.helpText, wrap=True ) iPx = SHARED.theme.baseIconHeight diff --git a/novelwriter/dialogs/docsplit.py b/novelwriter/dialogs/docsplit.py index 5c4e586b..5dae422a 100644 --- a/novelwriter/dialogs/docsplit.py +++ b/novelwriter/dialogs/docsplit.py @@ -62,7 +62,7 @@ class GuiDocSplit(NDialog): self.headLabel.setFont(SHARED.theme.guiFontB) self.helpLabel = NColourLabel( self.tr("Select the maximum level to split into files."), - SHARED.theme.helpText, parent=self, wrap=True + self, color=SHARED.theme.helpText, wrap=True ) # Values diff --git a/novelwriter/dialogs/preferences.py b/novelwriter/dialogs/preferences.py index d08498b2..2904476e 100644 --- a/novelwriter/dialogs/preferences.py +++ b/novelwriter/dialogs/preferences.py @@ -66,8 +66,8 @@ class GuiPreferences(NDialog): # Title self.titleLabel = NColourLabel( - self.tr("Preferences"), SHARED.theme.helpText, - parent=self, scale=NColourLabel.HEADER_SCALE, indent=CONFIG.pxInt(4) + self.tr("Preferences"), self, color=SHARED.theme.helpText, + scale=NColourLabel.HEADER_SCALE, indent=CONFIG.pxInt(4) ) # Search Box diff --git a/novelwriter/dialogs/projectsettings.py b/novelwriter/dialogs/projectsettings.py index c8d72d88..e718634f 100644 --- a/novelwriter/dialogs/projectsettings.py +++ b/novelwriter/dialogs/projectsettings.py @@ -76,8 +76,8 @@ class GuiProjectSettings(NDialog): # Title self.titleLabel = NColourLabel( - self.tr("Project Settings"), SHARED.theme.helpText, - parent=self, scale=NColourLabel.HEADER_SCALE, indent=CONFIG.pxInt(4) + self.tr("Project Settings"), self, color=SHARED.theme.helpText, + scale=NColourLabel.HEADER_SCALE, indent=CONFIG.pxInt(4) ) # SideBar @@ -345,7 +345,7 @@ class _StatusPage(NFixedPage): # Title self.pageTitle = NColourLabel( - pageLabel, SHARED.theme.helpText, parent=self, + pageLabel, self, color=SHARED.theme.helpText, scale=NColourLabel.HEADER_SCALE ) @@ -637,8 +637,8 @@ class _ReplacePage(NFixedPage): # Title self.pageTitle = NColourLabel( - self.tr("Text Auto-Replace for Preview and Build"), - SHARED.theme.helpText, parent=self, scale=NColourLabel.HEADER_SCALE + self.tr("Text Auto-Replace for Preview and Build"), self, + color=SHARED.theme.helpText, scale=NColourLabel.HEADER_SCALE ) # List Box diff --git a/novelwriter/dialogs/wordlist.py b/novelwriter/dialogs/wordlist.py index 8f3f53f5..8009d157 100644 --- a/novelwriter/dialogs/wordlist.py +++ b/novelwriter/dialogs/wordlist.py @@ -69,7 +69,7 @@ class GuiWordList(NDialog): # Header self.headLabel = NColourLabel( - self.tr("Project Word List"), SHARED.theme.helpText, parent=self, + self.tr("Project Word List"), self, color=SHARED.theme.helpText, scale=NColourLabel.HEADER_SCALE ) diff --git a/novelwriter/extensions/configlayout.py b/novelwriter/extensions/configlayout.py index e9f8194d..ca9d582e 100644 --- a/novelwriter/extensions/configlayout.py +++ b/novelwriter/extensions/configlayout.py @@ -203,7 +203,7 @@ class NScrollableForm(QScrollArea): if helpText: qHelp = NColourLabel( - str(helpText), color=self._helpCol, parent=self, + str(helpText), self, color=self._helpCol, scale=self._fontScale, wrap=True, indent=self._indent ) labelBox = QVBoxLayout() @@ -252,11 +252,20 @@ class NColourLabel(QLabel): HELP_SCALE = DEFAULT_SCALE HEADER_SCALE = 1.25 - def __init__(self, text: str, color: QColor | None = None, parent: QWidget | None = None, - scale: float = HELP_SCALE, wrap: bool = False, indent: int = 0, - bold: bool = False) -> None: + _state = None + + def __init__( + self, text: str, parent: QWidget, *, + color: QColor | None = None, faded: QColor | None = None, + scale: float = HELP_SCALE, wrap: bool = False, indent: int = 0, + bold: bool = False + ) -> None: super().__init__(text, parent=parent) + default = self.palette().windowText().color() + self._color = color or default + self._faded = faded or default + font = self.font() font.setPointSizeF(scale*font.pointSizeF()) font.setWeight(QFont.Weight.Bold if bold else QFont.Weight.Normal) @@ -268,9 +277,20 @@ class NColourLabel(QLabel): self.setFont(font) self.setIndent(indent) self.setWordWrap(wrap) + self.setColorState(True) return + def setColorState(self, state: bool) -> None: + """Change the colour state.""" + if self._state is not state: + self._state = state + print("State:", state, type(self.parent()).__name__) + colour = self.palette() + colour.setColor(QPalette.ColorRole.WindowText, self._color if state else self._faded) + self.setPalette(colour) + return + class NWrappedWidgetBox(QHBoxLayout): """Extension: A Text-Wrapped Widget Box diff --git a/novelwriter/gui/outline.py b/novelwriter/gui/outline.py index aa3d756d..3a411f35 100644 --- a/novelwriter/gui/outline.py +++ b/novelwriter/gui/outline.py @@ -215,7 +215,7 @@ class GuiOutlineToolBar(QToolBar): # Novel Selector self.novelLabel = NColourLabel( - self.tr("Outline of"), parent=self, scale=NColourLabel.HEADER_SCALE, bold=True + self.tr("Outline of"), self, scale=NColourLabel.HEADER_SCALE, bold=True ) self.novelLabel.setContentsMargins(0, 0, CONFIG.pxInt(12), 0) diff --git a/novelwriter/tools/manussettings.py b/novelwriter/tools/manussettings.py index f060a7b0..8964dcf4 100644 --- a/novelwriter/tools/manussettings.py +++ b/novelwriter/tools/manussettings.py @@ -98,8 +98,8 @@ class GuiBuildSettings(NToolDialog): # Title self.titleLabel = NColourLabel( - self.tr("Manuscript Build Settings"), SHARED.theme.helpText, - parent=self, scale=NColourLabel.HEADER_SCALE, indent=CONFIG.pxInt(4) + self.tr("Manuscript Build Settings"), self, color=SHARED.theme.helpText, + scale=NColourLabel.HEADER_SCALE, indent=CONFIG.pxInt(4) ) # Settings Name diff --git a/novelwriter/tools/noveldetails.py b/novelwriter/tools/noveldetails.py index cd7f5f38..a7cb80c4 100644 --- a/novelwriter/tools/noveldetails.py +++ b/novelwriter/tools/noveldetails.py @@ -68,8 +68,8 @@ class GuiNovelDetails(NNonBlockingDialog): # Title self.titleLabel = NColourLabel( - self.tr("Novel Details"), SHARED.theme.helpText, - parent=self, scale=NColourLabel.HEADER_SCALE, indent=CONFIG.pxInt(4) + self.tr("Novel Details"), self, color=SHARED.theme.helpText, + scale=NColourLabel.HEADER_SCALE, indent=CONFIG.pxInt(4) ) # Novel Selector @@ -199,8 +199,8 @@ class _OverviewPage(NScrollablePage): # Project Info self.projLabel = NColourLabel( - self.tr("Project"), SHARED.theme.helpText, - parent=self, scale=NColourLabel.HEADER_SCALE + self.tr("Project"), self, color=SHARED.theme.helpText, + scale=NColourLabel.HEADER_SCALE ) self.projName = QLabel("", self) @@ -223,8 +223,8 @@ class _OverviewPage(NScrollablePage): # Novel Info self.novelLabel = NColourLabel( - self.tr("Selected Novel"), SHARED.theme.helpText, - parent=self, scale=NColourLabel.HEADER_SCALE + self.tr("Selected Novel"), self, color=SHARED.theme.helpText, + scale=NColourLabel.HEADER_SCALE ) self.novelName = QLabel("", self) @@ -315,8 +315,8 @@ class _ContentsPage(NFixedPage): # Title self.contentLabel = NColourLabel( - self.tr("Table of Contents"), SHARED.theme.helpText, - parent=self, scale=NColourLabel.HEADER_SCALE + self.tr("Table of Contents"), self, color=SHARED.theme.helpText, + scale=NColourLabel.HEADER_SCALE ) # Contents Tree From 930c60ae4ae0b22dea63385e644c10d94e92cccf Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 18 Jun 2024 22:42:19 +0200 Subject: [PATCH 26/67] Add faded colour to theme --- novelwriter/assets/themes/cyberpunk_night.conf | 1 + novelwriter/assets/themes/default_dark.conf | 1 + novelwriter/assets/themes/default_light.conf | 1 + novelwriter/assets/themes/dracula.conf | 1 + novelwriter/assets/themes/solarized_dark.conf | 1 + novelwriter/assets/themes/solarized_light.conf | 1 + novelwriter/gui/theme.py | 3 +++ 7 files changed, 9 insertions(+) diff --git a/novelwriter/assets/themes/cyberpunk_night.conf b/novelwriter/assets/themes/cyberpunk_night.conf index e0b0f2cc..3cfc7c2a 100644 --- a/novelwriter/assets/themes/cyberpunk_night.conf +++ b/novelwriter/assets/themes/cyberpunk_night.conf @@ -25,6 +25,7 @@ linkvisited = 50, 0, 80 [GUI] helptext = 97, 97, 97 +fadedtext = 97, 97, 97 errortext = 255, 77, 77 statusnone = 50, 50, 50 statussaved = 77, 255, 77 diff --git a/novelwriter/assets/themes/default_dark.conf b/novelwriter/assets/themes/default_dark.conf index 6a908741..8fcc4b18 100644 --- a/novelwriter/assets/themes/default_dark.conf +++ b/novelwriter/assets/themes/default_dark.conf @@ -26,6 +26,7 @@ linkvisited = 102, 153, 204 [GUI] helptext = 164, 164, 164 +fadedtext = 128, 128, 128 errortext = 255, 164, 164 statusnone = 150, 152, 150 statussaved = 39, 135, 78 diff --git a/novelwriter/assets/themes/default_light.conf b/novelwriter/assets/themes/default_light.conf index f8240bcb..6f221c86 100644 --- a/novelwriter/assets/themes/default_light.conf +++ b/novelwriter/assets/themes/default_light.conf @@ -26,6 +26,7 @@ linkvisited = 66, 113, 174 [GUI] helptext = 92, 92, 92 +fadedtext = 128, 128, 128 errortext = 255, 92, 92 statusnone = 120, 120, 120 statussaved = 200, 15, 39 diff --git a/novelwriter/assets/themes/dracula.conf b/novelwriter/assets/themes/dracula.conf index 4946b218..a787dcd4 100644 --- a/novelwriter/assets/themes/dracula.conf +++ b/novelwriter/assets/themes/dracula.conf @@ -41,6 +41,7 @@ linkvisited = 139, 233, 253 [GUI] helptext = 204, 172, 249 +fadedtext = 98, 114, 164 errortext = 255, 85, 85 statusnone = 98, 114, 164 statussaved = 80, 250, 123 diff --git a/novelwriter/assets/themes/solarized_dark.conf b/novelwriter/assets/themes/solarized_dark.conf index b3599913..5a4df68b 100644 --- a/novelwriter/assets/themes/solarized_dark.conf +++ b/novelwriter/assets/themes/solarized_dark.conf @@ -25,6 +25,7 @@ linkvisited = 38, 139, 210 [GUI] helptext = 166, 161, 149 +fadedtext = 166, 161, 149 errortext = 255, 161, 149 statusnone = 88, 110, 117 statussaved = 42, 161, 152 diff --git a/novelwriter/assets/themes/solarized_light.conf b/novelwriter/assets/themes/solarized_light.conf index b9c68ec7..ca314428 100644 --- a/novelwriter/assets/themes/solarized_light.conf +++ b/novelwriter/assets/themes/solarized_light.conf @@ -25,6 +25,7 @@ linkvisited = 38, 139, 210 [GUI] helptext = 78, 91, 95 +fadedtext = 78, 91, 95 errortext = 255, 91, 95 statusnone = 88, 110, 117 statussaved = 42, 161, 152 diff --git a/novelwriter/gui/theme.py b/novelwriter/gui/theme.py index 72a95178..4576255a 100644 --- a/novelwriter/gui/theme.py +++ b/novelwriter/gui/theme.py @@ -75,6 +75,7 @@ class GuiTheme: self.statUnsaved = QColor(0, 0, 0) self.statSaved = QColor(0, 0, 0) self.helpText = QColor(0, 0, 0) + self.fadedText = QColor(0, 0, 0) self.errorText = QColor(255, 0, 0) # Loaded Syntax Settings @@ -263,6 +264,7 @@ class GuiTheme: sec = "GUI" if parser.has_section(sec): self.helpText = self._parseColour(parser, sec, "helptext") + self.fadedText = self._parseColour(parser, sec, "fadedtext") self.errorText = self._parseColour(parser, sec, "errortext") self.statNone = self._parseColour(parser, sec, "statusnone") self.statUnsaved = self._parseColour(parser, sec, "statusunsaved") @@ -405,6 +407,7 @@ class GuiTheme: self.statUnsaved = QColor(200, 15, 39) self.statSaved = QColor(2, 133, 37) self.helpText = QColor(0, 0, 0) + self.fadedText = QColor(128, 128, 128) self.errorText = QColor(255, 0, 0) return From c6569b63e5832a70849834fe28f4eb2ae99e2f70 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 18 Jun 2024 22:42:52 +0200 Subject: [PATCH 27/67] Add focus indication to editor and viewer header --- novelwriter/gui/doceditor.py | 10 ++++++++-- novelwriter/gui/docviewer.py | 15 +++++++++++---- novelwriter/guimain.py | 23 +++++++++++++++++++++++ tests/test_base/test_base_init.py | 20 +++++++++++--------- 4 files changed, 53 insertions(+), 15 deletions(-) diff --git a/novelwriter/gui/doceditor.py b/novelwriter/gui/doceditor.py index 5288b068..39adc29d 100644 --- a/novelwriter/gui/doceditor.py +++ b/novelwriter/gui/doceditor.py @@ -55,6 +55,7 @@ from novelwriter.common import minmax, transferCase from novelwriter.constants import nwConst, nwKeyWords, nwShortcode, nwUnicode from novelwriter.core.document import NWDocument from novelwriter.enum import nwComment, nwDocAction, nwDocInsert, nwDocMode, nwItemClass, nwTrinary +from novelwriter.extensions.configlayout import NColourLabel from novelwriter.extensions.eventfilters import WheelEventFilter from novelwriter.extensions.modified import NIconToggleButton, NIconToolButton from novelwriter.gui.dochighlight import BLOCK_META, BLOCK_TITLE @@ -210,6 +211,7 @@ class GuiDocEditor(QPlainTextEdit): # Function Mapping self.closeSearch = self.docSearch.closeSearch self.searchVisible = self.docSearch.isVisible + self.changeFocusState = self.docHeader.changeFocusState # Finalise self.updateSyntaxColours() @@ -2785,8 +2787,7 @@ class GuiDocEditHeader(QWidget): self.setAutoFillBackground(True) # Title Label - self.itemTitle = QLabel("", self) - self.itemTitle.setIndent(0) + self.itemTitle = NColourLabel("", self, faded=SHARED.theme.fadedText) self.itemTitle.setMargin(0) self.itemTitle.setContentsMargins(0, 0, 0, 0) self.itemTitle.setAutoFillBackground(True) @@ -2924,6 +2925,11 @@ class GuiDocEditHeader(QWidget): return + def changeFocusState(self, state: bool) -> None: + """Toggle focus state.""" + self.itemTitle.setColorState(state) + return + def setHandle(self, tHandle: str) -> None: """Set the document title from the handle, or alternatively, set the whole document path within the project. diff --git a/novelwriter/gui/docviewer.py b/novelwriter/gui/docviewer.py index 20e1888b..1029a152 100644 --- a/novelwriter/gui/docviewer.py +++ b/novelwriter/gui/docviewer.py @@ -33,7 +33,7 @@ from enum import Enum from PyQt5.QtCore import QPoint, Qt, QUrl, pyqtSignal, pyqtSlot from PyQt5.QtGui import QCursor, QMouseEvent, QPalette, QResizeEvent, QTextCursor from PyQt5.QtWidgets import ( - QAction, QApplication, QFrame, QHBoxLayout, QLabel, QMenu, QTextBrowser, + QAction, QApplication, QFrame, QHBoxLayout, QMenu, QTextBrowser, QToolButton, QWidget ) @@ -42,6 +42,7 @@ from novelwriter.constants import nwHeaders, nwUnicode from novelwriter.core.toqdoc import TextDocumentTheme, ToQTextDocument from novelwriter.enum import nwDocAction, nwDocMode, nwItemType from novelwriter.error import logException +from novelwriter.extensions.configlayout import NColourLabel from novelwriter.extensions.eventfilters import WheelEventFilter from novelwriter.extensions.modified import NIconToolButton from novelwriter.gui.theme import STYLES_MIN_TOOLBUTTON @@ -92,6 +93,9 @@ class GuiDocViewer(QTextBrowser): self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu) self.customContextMenuRequested.connect(self._openContextMenu) + # Function Mapping + self.changeFocusState = self.docHeader.changeFocusState + self.initViewer() logger.debug("Ready: GuiDocViewer") @@ -597,9 +601,7 @@ class GuiDocViewHeader(QWidget): self.setAutoFillBackground(True) # Title Label - self.itemTitle = QLabel(self) - self.itemTitle.setText("") - self.itemTitle.setIndent(0) + self.itemTitle = NColourLabel("", self, faded=SHARED.theme.fadedText) self.itemTitle.setMargin(0) self.itemTitle.setContentsMargins(0, 0, 0, 0) self.itemTitle.setAutoFillBackground(True) @@ -738,6 +740,11 @@ class GuiDocViewHeader(QWidget): self.itemTitle.setPalette(palette) return + def changeFocusState(self, state: bool) -> None: + """Toggle focus state.""" + self.itemTitle.setColorState(state) + return + def setHandle(self, tHandle: str) -> None: """Sets the document title from the handle, or alternatively, set the whole document path. diff --git a/novelwriter/guimain.py b/novelwriter/guimain.py index faee427b..00932967 100644 --- a/novelwriter/guimain.py +++ b/novelwriter/guimain.py @@ -326,6 +326,11 @@ class GuiMain(QMainWindow): def postLaunchTasks(self, cmdOpen: str | None) -> None: """Process tasks after the main window has been created.""" + QApplication.processEvents() + app = QApplication.instance() + if isinstance(app, QApplication): + app.focusChanged.connect(self._appFocusChanged) + # Check that config loaded fine if CONFIG.hasError: SHARED.error(CONFIG.errorText()) @@ -948,6 +953,24 @@ class GuiMain(QMainWindow): # Private Slots ## + @pyqtSlot("QWidget*", "QWidget*") + def _appFocusChanged(self, old: QWidget, new: QWidget) -> None: + """Alert main widgets that they have received or lost focus.""" + if isinstance(new, QWidget): + docEditor = False + docViewer = False + if self.docEditor.isAncestorOf(new): + docEditor = True + elif self.docViewer.isAncestorOf(new): + docViewer = True + + self.docEditor.changeFocusState(docEditor) + self.docViewer.changeFocusState(docViewer) + + logger.debug("Main focus switched to: %s", type(new).__name__) + + return + @pyqtSlot(bool) def _focusModeChanged(self, focusMode: bool) -> None: """Handle change of focus mode. The Main GUI Focus Mode hides diff --git a/tests/test_base/test_base_init.py b/tests/test_base/test_base_init.py index 2b7ebc47..0ff69505 100644 --- a/tests/test_base/test_base_init.py +++ b/tests/test_base/test_base_init.py @@ -62,15 +62,17 @@ def testBaseInit_Launch(caplog, monkeypatch, fncPath): CONFIG.osWindows = osWindows # Normal Launch - monkeypatch.setattr("PyQt5.QtWidgets.QApplication.__init__", lambda *a: None) - monkeypatch.setattr("PyQt5.QtWidgets.QApplication.setApplicationName", lambda *a: None) - monkeypatch.setattr("PyQt5.QtWidgets.QApplication.setApplicationVersion", lambda *a: None) - monkeypatch.setattr("PyQt5.QtWidgets.QApplication.setWindowIcon", lambda *a: None) - monkeypatch.setattr("PyQt5.QtWidgets.QApplication.setOrganizationDomain", lambda *a: None) - monkeypatch.setattr("PyQt5.QtWidgets.QApplication.exec", lambda *a: 0) - with pytest.raises(SystemExit) as ex: - main([f"--config={fncPath}", f"--data={fncPath}"]) - assert ex.value.code == 0 + with monkeypatch.context() as mp: + mp.setattr("PyQt5.QtWidgets.QApplication.__init__", lambda *a: None) + mp.setattr("PyQt5.QtWidgets.QApplication.setApplicationName", lambda *a: None) + mp.setattr("PyQt5.QtWidgets.QApplication.setApplicationVersion", lambda *a: None) + mp.setattr("PyQt5.QtWidgets.QApplication.setWindowIcon", lambda *a: None) + mp.setattr("PyQt5.QtWidgets.QApplication.setOrganizationDomain", lambda *a: None) + mp.setattr("PyQt5.QtWidgets.QApplication.exec", lambda *a: 0) + # mp.setattr("PyQt5.QtWidgets.QApplication.focusChange.connect", lambda *a: None) + with pytest.raises(SystemExit) as ex: + main([f"--config={fncPath}", f"--data={fncPath}"]) + assert ex.value.code == 0 @pytest.mark.base From ea7f3fe51c6b0143041f2030a053df5a8e8fef97 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 19 Jun 2024 20:42:23 +0200 Subject: [PATCH 28/67] Add editor/viewer toggle feature --- novelwriter/assets/themes/default_dark.conf | 2 +- novelwriter/assets/themes/default_light.conf | 2 +- novelwriter/enum.py | 9 ++++--- novelwriter/extensions/configlayout.py | 5 ++-- novelwriter/gui/docviewer.py | 4 ++++ novelwriter/gui/mainmenu.py | 18 +++++++------- novelwriter/guimain.py | 25 +++++++++++--------- tests/test_gui/test_gui_doceditor.py | 6 ++--- tests/test_gui/test_gui_guimain.py | 24 +++++++++---------- tests/test_gui/test_gui_noveltree.py | 4 ++-- tests/test_gui/test_gui_projtree.py | 6 ++--- 11 files changed, 54 insertions(+), 51 deletions(-) diff --git a/novelwriter/assets/themes/default_dark.conf b/novelwriter/assets/themes/default_dark.conf index 8fcc4b18..906cc9fe 100644 --- a/novelwriter/assets/themes/default_dark.conf +++ b/novelwriter/assets/themes/default_dark.conf @@ -26,7 +26,7 @@ linkvisited = 102, 153, 204 [GUI] helptext = 164, 164, 164 -fadedtext = 128, 128, 128 +fadedtext = 148, 148, 148 errortext = 255, 164, 164 statusnone = 150, 152, 150 statussaved = 39, 135, 78 diff --git a/novelwriter/assets/themes/default_light.conf b/novelwriter/assets/themes/default_light.conf index 6f221c86..a02a12f9 100644 --- a/novelwriter/assets/themes/default_light.conf +++ b/novelwriter/assets/themes/default_light.conf @@ -26,7 +26,7 @@ linkvisited = 66, 113, 174 [GUI] helptext = 92, 92, 92 -fadedtext = 128, 128, 128 +fadedtext = 108, 108, 108 errortext = 255, 92, 92 statusnone = 120, 120, 120 statussaved = 200, 15, 39 diff --git a/novelwriter/enum.py b/novelwriter/enum.py index 53155d2a..649509a1 100644 --- a/novelwriter/enum.py +++ b/novelwriter/enum.py @@ -148,12 +148,11 @@ class nwView(Enum): SEARCH = 4 -class nwWidget(Enum): +class nwFocus(Enum): - TREE = 1 - EDITOR = 2 - VIEWER = 3 - OUTLINE = 4 + TREE = 1 + DOCUMENT = 2 + OUTLINE = 3 class nwOutline(Enum): diff --git a/novelwriter/extensions/configlayout.py b/novelwriter/extensions/configlayout.py index ca9d582e..3bb7b289 100644 --- a/novelwriter/extensions/configlayout.py +++ b/novelwriter/extensions/configlayout.py @@ -34,7 +34,7 @@ from PyQt5.QtWidgets import ( QVBoxLayout, QWidget ) -from novelwriter import CONFIG +from novelwriter import CONFIG, SHARED DEFAULT_SCALE = 0.9 @@ -266,7 +266,7 @@ class NColourLabel(QLabel): self._color = color or default self._faded = faded or default - font = self.font() + font = SHARED.theme.guiFont font.setPointSizeF(scale*font.pointSizeF()) font.setWeight(QFont.Weight.Bold if bold else QFont.Weight.Normal) if color: @@ -285,7 +285,6 @@ class NColourLabel(QLabel): """Change the colour state.""" if self._state is not state: self._state = state - print("State:", state, type(self.parent()).__name__) colour = self.palette() colour.setColor(QPalette.ColorRole.WindowText, self._color if state else self._faded) self.setPalette(colour) diff --git a/novelwriter/gui/docviewer.py b/novelwriter/gui/docviewer.py index 1029a152..b28411ab 100644 --- a/novelwriter/gui/docviewer.py +++ b/novelwriter/gui/docviewer.py @@ -282,6 +282,10 @@ class GuiDocViewer(QTextBrowser): return False return True + def anyFocus(self) -> bool: + """Check if any widget or child widget has focus.""" + return self.hasFocus() or self.isAncestorOf(QApplication.focusWidget()) + def clearNavHistory(self) -> None: """Clear the navigation history.""" self.docHistory.clear() diff --git a/novelwriter/gui/mainmenu.py b/novelwriter/gui/mainmenu.py index 56dc45d7..4a71c4f1 100644 --- a/novelwriter/gui/mainmenu.py +++ b/novelwriter/gui/mainmenu.py @@ -35,7 +35,7 @@ from PyQt5.QtWidgets import QAction, QMenuBar from novelwriter import CONFIG, SHARED from novelwriter.common import openExternalPath from novelwriter.constants import nwConst, nwKeyWords, nwLabels, nwUnicode, trConst -from novelwriter.enum import nwDocAction, nwDocInsert, nwView, nwWidget +from novelwriter.enum import nwDocAction, nwDocInsert, nwFocus, nwView from novelwriter.extensions.eventfilters import StatusTipFilter if TYPE_CHECKING: # pragma: no cover @@ -54,7 +54,7 @@ class GuiMainMenu(QMenuBar): requestDocInsert = pyqtSignal(nwDocInsert) requestDocInsertText = pyqtSignal(str) requestDocKeyWordInsert = pyqtSignal(str) - requestFocusChange = pyqtSignal(nwWidget) + requestFocusChange = pyqtSignal(nwFocus) requestViewChange = pyqtSignal(nwView) def __init__(self, mainGui: GuiMain) -> None: @@ -303,24 +303,24 @@ class GuiMainMenu(QMenuBar): self.viewMenu = self.addMenu(self.tr("&View")) # View > TreeView - self.aFocusTree = self.viewMenu.addAction(self.tr("Go to Project Tree")) + self.aFocusTree = self.viewMenu.addAction(self.tr("Go to Tree View")) self.aFocusTree.setShortcut("Ctrl+T") self.aFocusTree.triggered.connect( - lambda: self.requestFocusChange.emit(nwWidget.TREE) + lambda: self.requestFocusChange.emit(nwFocus.TREE) ) # View > Document Editor - self.aFocusEditor = self.viewMenu.addAction(self.tr("Go to Document Editor")) - self.aFocusEditor.setShortcut("Ctrl+E") - self.aFocusEditor.triggered.connect( - lambda: self.requestFocusChange.emit(nwWidget.EDITOR) + self.aFocusDocument = self.viewMenu.addAction(self.tr("Go to Document")) + self.aFocusDocument.setShortcut("Ctrl+E") + self.aFocusDocument.triggered.connect( + lambda: self.requestFocusChange.emit(nwFocus.DOCUMENT) ) # View > Outline self.aFocusOutline = self.viewMenu.addAction(self.tr("Go to Outline")) self.aFocusOutline.setShortcut("Ctrl+Shift+T") self.aFocusOutline.triggered.connect( - lambda: self.requestFocusChange.emit(nwWidget.OUTLINE) + lambda: self.requestFocusChange.emit(nwFocus.OUTLINE) ) # View > Separator diff --git a/novelwriter/guimain.py b/novelwriter/guimain.py index 00932967..443d3236 100644 --- a/novelwriter/guimain.py +++ b/novelwriter/guimain.py @@ -44,7 +44,7 @@ from novelwriter.dialogs.about import GuiAbout from novelwriter.dialogs.preferences import GuiPreferences from novelwriter.dialogs.projectsettings import GuiProjectSettings from novelwriter.dialogs.wordlist import GuiWordList -from novelwriter.enum import nwDocAction, nwDocInsert, nwDocMode, nwItemType, nwView, nwWidget +from novelwriter.enum import nwDocAction, nwDocInsert, nwDocMode, nwFocus, nwItemType, nwView from novelwriter.gui.doceditor import GuiDocEditor from novelwriter.gui.docviewer import GuiDocViewer from novelwriter.gui.docviewerpanel import GuiDocViewerPanel @@ -978,7 +978,8 @@ class GuiMain(QMainWindow): """ if focusMode: logger.debug("Activating Focus Mode") - self._switchFocus(nwWidget.EDITOR) + self._changeView(nwView.EDITOR) + self.docEditor.setFocus() else: logger.debug("Deactivating Focus Mode") @@ -1001,10 +1002,10 @@ class GuiMain(QMainWindow): self.docEditor.ensureCursorVisibleNoCentre() return - @pyqtSlot(nwWidget) - def _switchFocus(self, paneNo: nwWidget) -> None: + @pyqtSlot(nwFocus) + def _switchFocus(self, paneNo: nwFocus) -> None: """Switch focus between main GUI views.""" - if paneNo == nwWidget.TREE: + if paneNo == nwFocus.TREE: if self.projStack.currentWidget() is self.projView: if self.projView.treeHasFocus(): self._changeView(nwView.NOVEL) @@ -1020,13 +1021,15 @@ class GuiMain(QMainWindow): else: self._changeView(nwView.PROJECT) self.projView.setTreeFocus() - elif paneNo == nwWidget.EDITOR: + elif paneNo == nwFocus.DOCUMENT: self._changeView(nwView.EDITOR) - self.docEditor.setFocus() - elif paneNo == nwWidget.VIEWER: - self._changeView(nwView.EDITOR) - self.docViewer.setFocus() - elif paneNo == nwWidget.OUTLINE: + if self.docEditor.anyFocus(): + self.docViewer.setFocus() + elif self.docViewer.anyFocus(): + self.docEditor.setFocus() + else: + self.docEditor.setFocus() + elif paneNo == nwFocus.OUTLINE: self._changeView(nwView.OUTLINE) self.outlineView.setTreeFocus() return diff --git a/tests/test_gui/test_gui_doceditor.py b/tests/test_gui/test_gui_doceditor.py index a35cc16c..c4300be8 100644 --- a/tests/test_gui/test_gui_doceditor.py +++ b/tests/test_gui/test_gui_doceditor.py @@ -29,9 +29,7 @@ from PyQt5.QtWidgets import QAction, QApplication, QMenu from novelwriter import CONFIG, SHARED from novelwriter.constants import nwKeyWords, nwUnicode from novelwriter.dialogs.editlabel import GuiEditLabel -from novelwriter.enum import ( - nwDocAction, nwDocInsert, nwItemClass, nwItemLayout, nwTrinary, nwWidget -) +from novelwriter.enum import nwDocAction, nwDocInsert, nwItemClass, nwItemLayout, nwTrinary from novelwriter.gui.doceditor import GuiDocEditor from novelwriter.text.counting import standardCounter from novelwriter.types import ( @@ -1678,7 +1676,7 @@ def testGuiEditor_Completer(qtbot, nwGUI, projPath, mockRnd): completer = docEditor._completer # Create Scene - nwGUI._switchFocus(nwWidget.EDITOR) + nwGUI.docEditor.setFocus() for c in "### Scene One": qtbot.keyClick(docEditor, c, delay=KEY_DELAY) qtbot.keyClick(docEditor, Qt.Key_Return, delay=KEY_DELAY) diff --git a/tests/test_gui/test_gui_guimain.py b/tests/test_gui/test_gui_guimain.py index 1f011c37..683ce18f 100644 --- a/tests/test_gui/test_gui_guimain.py +++ b/tests/test_gui/test_gui_guimain.py @@ -32,7 +32,7 @@ from PyQt5.QtWidgets import QInputDialog, QMenu from novelwriter import CONFIG, SHARED from novelwriter.dialogs.editlabel import GuiEditLabel -from novelwriter.enum import nwItemType, nwView, nwWidget +from novelwriter.enum import nwFocus, nwItemType, nwView from novelwriter.gui.doceditor import GuiDocEditor from novelwriter.gui.noveltree import GuiNovelView from novelwriter.gui.outline import GuiOutlineView @@ -113,7 +113,7 @@ def testGuiMain_ProjectTreeItems(qtbot, monkeypatch, nwGUI, projPath, mockRnd): # Project Tree has focus nwGUI._changeView(nwView.PROJECT) - nwGUI._switchFocus(nwWidget.TREE) + nwGUI._switchFocus(nwFocus.TREE) nwGUI.projStack.setCurrentIndex(0) with monkeypatch.context() as mp: mp.setattr(GuiProjectTree, "hasFocus", lambda *a: True) @@ -137,7 +137,7 @@ def testGuiMain_ProjectTreeItems(qtbot, monkeypatch, nwGUI, projPath, mockRnd): # Project Outline has focus nwGUI._changeView(nwView.OUTLINE) - nwGUI._switchFocus(nwWidget.OUTLINE) + nwGUI._switchFocus(nwFocus.OUTLINE) with monkeypatch.context() as mp: mp.setattr(GuiOutlineView, "treeHasFocus", lambda *a: True) assert nwGUI.docEditor.docHandle is None @@ -230,7 +230,7 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, projPath, tstPaths, mockRnd): CONFIG.autoScroll = True # Add a Character File - nwGUI._switchFocus(nwWidget.TREE) + nwGUI._switchFocus(nwFocus.TREE) nwGUI.projView.projTree.clearSelection() nwGUI.projView.projTree._getTreeItem(C.hCharRoot).setSelected(True) nwGUI.projView.projTree.newTreeItem(nwItemType.FILE, None, isNote=True) @@ -250,7 +250,7 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, projPath, tstPaths, mockRnd): docEditor._qDocument.syntaxHighlighter.initHighlighter() # Type something into the document - nwGUI._switchFocus(nwWidget.EDITOR) + nwGUI.docEditor.setFocus() qtbot.keyClick(docEditor, "a", modifier=Qt.ControlModifier, delay=KEY_DELAY) for c in "# Jane Doe": qtbot.keyClick(docEditor, c, delay=KEY_DELAY) @@ -265,14 +265,14 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, projPath, tstPaths, mockRnd): qtbot.keyClick(docEditor, Qt.Key_Return, delay=KEY_DELAY) # Add a Plot File - nwGUI._switchFocus(nwWidget.TREE) + nwGUI._switchFocus(nwFocus.TREE) nwGUI.projView.projTree.clearSelection() nwGUI.projView.projTree._getTreeItem(C.hPlotRoot).setSelected(True) nwGUI.projView.projTree.newTreeItem(nwItemType.FILE, None, isNote=True) nwGUI.openSelectedItem() # Type something into the document - nwGUI._switchFocus(nwWidget.EDITOR) + nwGUI.docEditor.setFocus() qtbot.keyClick(docEditor, "a", modifier=Qt.ControlModifier, delay=KEY_DELAY) for c in "# Main Plot": qtbot.keyClick(docEditor, c, delay=KEY_DELAY) @@ -287,7 +287,7 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, projPath, tstPaths, mockRnd): qtbot.keyClick(docEditor, Qt.Key_Return, delay=KEY_DELAY) # Add a World File - nwGUI._switchFocus(nwWidget.TREE) + nwGUI._switchFocus(nwFocus.TREE) nwGUI.projView.projTree.clearSelection() nwGUI.projView.projTree._getTreeItem(C.hWorldRoot).setSelected(True) nwGUI.projView.projTree.newTreeItem(nwItemType.FILE, None, isNote=True) @@ -299,7 +299,7 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, projPath, tstPaths, mockRnd): docEditor.replaceText("") # Type something into the document - nwGUI._switchFocus(nwWidget.EDITOR) + nwGUI.docEditor.setFocus() qtbot.keyClick(docEditor, "a", modifier=Qt.ControlModifier, delay=KEY_DELAY) for c in "# Main Location": qtbot.keyClick(docEditor, c, delay=KEY_DELAY) @@ -318,7 +318,7 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, projPath, tstPaths, mockRnd): nwGUI._autoSaveProject() # Select the 'New Scene' file - nwGUI._switchFocus(nwWidget.TREE) + nwGUI._switchFocus(nwFocus.TREE) nwGUI.projView.projTree.clearSelection() nwGUI.projView.projTree._getTreeItem(C.hNovelRoot).setExpanded(True) nwGUI.projView.projTree._getTreeItem(C.hChapterDir).setExpanded(True) @@ -326,7 +326,7 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, projPath, tstPaths, mockRnd): nwGUI.openSelectedItem() # Type something into the document - nwGUI._switchFocus(nwWidget.EDITOR) + nwGUI.docEditor.setFocus() qtbot.keyClick(docEditor, "a", modifier=Qt.ControlModifier, delay=KEY_DELAY) for c in "# Novel": qtbot.keyClick(docEditor, c, delay=KEY_DELAY) @@ -535,7 +535,7 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, projPath, tstPaths, mockRnd): nwGUI.rebuildIndex() # Open and view the edited document - nwGUI._switchFocus(nwWidget.VIEWER) + nwGUI.docViewer.setFocus() assert nwGUI.openDocument(C.hSceneDoc) assert nwGUI.viewDocument(C.hSceneDoc) assert nwGUI.saveProject() diff --git a/tests/test_gui/test_gui_noveltree.py b/tests/test_gui/test_gui_noveltree.py index 593de829..288702c6 100644 --- a/tests/test_gui/test_gui_noveltree.py +++ b/tests/test_gui/test_gui_noveltree.py @@ -30,7 +30,7 @@ from PyQt5.QtWidgets import QInputDialog, QToolTip from novelwriter import CONFIG, SHARED from novelwriter.dialogs.editlabel import GuiEditLabel -from novelwriter.enum import nwItemType, nwWidget +from novelwriter.enum import nwFocus, nwItemType from novelwriter.gui.noveltree import GuiNovelTree, NovelTreeColumn from novelwriter.types import QtMouseLeft @@ -44,7 +44,7 @@ def testGuiNovelTree_TreeItems(qtbot, monkeypatch, nwGUI, projPath, mockRnd): buildTestProject(nwGUI, projPath) - nwGUI._switchFocus(nwWidget.TREE) + nwGUI._switchFocus(nwFocus.TREE) nwGUI.projView.projTree.clearSelection() nwGUI.projView.projTree._getTreeItem(C.hCharRoot).setSelected(True) nwGUI.projView.projTree.newTreeItem(nwItemType.FILE) diff --git a/tests/test_gui/test_gui_projtree.py b/tests/test_gui/test_gui_projtree.py index 8342150f..29a945cf 100644 --- a/tests/test_gui/test_gui_projtree.py +++ b/tests/test_gui/test_gui_projtree.py @@ -34,7 +34,7 @@ from novelwriter.core.project import NWProject from novelwriter.dialogs.docmerge import GuiDocMerge from novelwriter.dialogs.docsplit import GuiDocSplit from novelwriter.dialogs.editlabel import GuiEditLabel -from novelwriter.enum import nwItemClass, nwItemLayout, nwItemType, nwWidget +from novelwriter.enum import nwFocus, nwItemClass, nwItemLayout, nwItemType from novelwriter.gui.projtree import GuiProjectTree, GuiProjectView, _TreeContextMenu from novelwriter.guimain import GuiMain from novelwriter.types import QtAccepted, QtModNone, QtMouseLeft, QtMouseMiddle, QtRejected @@ -1111,7 +1111,7 @@ def testGuiProjTree_ContextMenu(qtbot, monkeypatch, nwGUI, projPath, mockRnd): # Create a project buildTestProject(nwGUI, projPath) nwGUI.openProject(projPath) - nwGUI._switchFocus(nwWidget.TREE) + nwGUI._switchFocus(nwFocus.TREE) # Handles for new objects hCharNote = "0000000000011" @@ -1408,7 +1408,7 @@ def testGuiProjTree_Templates(qtbot, monkeypatch, nwGUI, projPath, mockRnd): # Create a project buildTestProject(nwGUI, projPath) nwGUI.openProject(projPath) - nwGUI._switchFocus(nwWidget.TREE) + nwGUI._switchFocus(nwFocus.TREE) nwGUI.show() project = SHARED.project From 5665efd9d7100ec5e73d9b452702fb6f9acab322 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 20 Jun 2024 23:32:02 +0200 Subject: [PATCH 29/67] Update docs and test coverage --- docs/source/more_customise.rst | 3 +- novelwriter/guimain.py | 13 ++- tests/test_gui/test_gui_guimain.py | 131 ++++++++++++++++++++++++++++- 3 files changed, 137 insertions(+), 10 deletions(-) diff --git a/docs/source/more_customise.rst b/docs/source/more_customise.rst index d0d02941..6ea7ca76 100644 --- a/docs/source/more_customise.rst +++ b/docs/source/more_customise.rst @@ -132,6 +132,7 @@ A GUI theme ``.conf`` file consists of the following settings: [GUI] helptext = 0, 0, 0 + fadedtext = 128, 128, 128 errortext = 255, 0, 0 statusnone = 120, 120, 120 statussaved = 2, 133, 37 @@ -149,7 +150,7 @@ colour values are RGB numbers on the format ``r, g, b`` where each is an integer not defined, it is computed as a colour between the ``window`` and ``windowtext`` colour. .. versionadded:: 2.5 - The ``errortext`` theme colour entry was added. + The ``fadedtext`` and ``errortext`` theme colour entries were added. Custom Syntax Theme diff --git a/novelwriter/guimain.py b/novelwriter/guimain.py index 443d3236..b7ccfedf 100644 --- a/novelwriter/guimain.py +++ b/novelwriter/guimain.py @@ -1172,16 +1172,13 @@ class GuiMain(QMainWindow): @pyqtSlot(nwDocAction) def _passDocumentAction(self, action: nwDocAction) -> None: - """Pass on a document action to the document viewer if it has - focus, or pass it to the document editor if it or any of its - child widgets have focus. If neither has focus, ignore it. + """Pass on a document action to the editor or viewer based on + which one has focus, or if neither has focus, ignore it. """ - if self.docViewer.hasFocus(): - self.docViewer.docAction(action) - elif self.docEditor.hasFocus(): + if self.docEditor.hasFocus(): self.docEditor.docAction(action) - else: - logger.debug("Action cancelled as neither editor nor viewer has focus") + elif self.docViewer.hasFocus(): + self.docViewer.docAction(action) return @pyqtSlot(str) diff --git a/tests/test_gui/test_gui_guimain.py b/tests/test_gui/test_gui_guimain.py index 683ce18f..80c3cf57 100644 --- a/tests/test_gui/test_gui_guimain.py +++ b/tests/test_gui/test_gui_guimain.py @@ -32,7 +32,7 @@ from PyQt5.QtWidgets import QInputDialog, QMenu from novelwriter import CONFIG, SHARED from novelwriter.dialogs.editlabel import GuiEditLabel -from novelwriter.enum import nwFocus, nwItemType, nwView +from novelwriter.enum import nwDocAction, nwFocus, nwItemType, nwView from novelwriter.gui.doceditor import GuiDocEditor from novelwriter.gui.noveltree import GuiNovelView from novelwriter.gui.outline import GuiOutlineView @@ -64,7 +64,21 @@ def testGuiMain_Launch(qtbot, monkeypatch, nwGUI, projPath): # Open Lipsum project nwGUI.postLaunchTasks(projPath) + assert SHARED.hasProject is True nwGUI.closeProject() + assert SHARED.hasProject is False + + # Open as if called from Welcome + nwGUI._openProjectFromWelcome(projPath) + assert SHARED.hasProject is True + nwGUI.closeProject() + assert SHARED.hasProject is False + + # Open as if called from Welcome, invalid path + with monkeypatch.context() as mp: + mp.setattr(nwGUI, "showWelcomeDialog", lambda *a: None) + nwGUI._openProjectFromWelcome(None) + assert SHARED.hasProject is False # Project open fails with monkeypatch.context() as mp: @@ -689,3 +703,118 @@ def testGuiMain_Features(qtbot, nwGUI, projPath, mockRnd): nwGUI.sideBar.mSettings.hide() # qtbot.stop() + + +@pytest.mark.gui +def testGuiMain_FocusView(qtbot, monkeypatch, nwGUI, projPath, mockRnd): + """Test switching focus and view of the main window.""" + buildTestProject(nwGUI, projPath) + + nwGUI.openDocument(C.hSceneDoc) + nwGUI.viewDocument(C.hSceneDoc) + + # Toggle Focus + # ============ + nwGUI.docEditor.setFocus() + assert nwGUI.docEditor.anyFocus() + + # Simulate focus change to viewer + nwGUI._appFocusChanged(None, nwGUI.docViewer) + assert nwGUI.docEditor.docHeader.itemTitle._state is False + assert nwGUI.docViewer.docHeader.itemTitle._state is True + + # Simulate focus change to editor + nwGUI._appFocusChanged(None, nwGUI.docEditor) + assert nwGUI.docEditor.docHeader.itemTitle._state is True + assert nwGUI.docViewer.docHeader.itemTitle._state is False + + # Focus Tree + # ========== + assert nwGUI.projStack.currentWidget() == nwGUI.projView + + # Switch from editor to project tree + nwGUI.docEditor.setFocus() + nwGUI._switchFocus(nwFocus.TREE) + assert nwGUI.projStack.currentWidget() == nwGUI.projView + + # Triggering again should switch to novel view + nwGUI._switchFocus(nwFocus.TREE) + assert nwGUI.projStack.currentWidget() == nwGUI.novelView + + # Switch from editor to novel view + nwGUI.docEditor.setFocus() + nwGUI._switchFocus(nwFocus.TREE) + assert nwGUI.projStack.currentWidget() == nwGUI.novelView + + # Triggering again should switch back to project tree + nwGUI._switchFocus(nwFocus.TREE) + assert nwGUI.projStack.currentWidget() == nwGUI.projView + + # If in search mode, should default to project tree + nwGUI._changeView(nwView.SEARCH) + nwGUI._switchFocus(nwFocus.TREE) + assert nwGUI.projStack.currentWidget() == nwGUI.projView + + # Focus Document + # ============== + nwGUI._switchFocus(nwFocus.TREE) + + def mockEmitEditorFocus(*a): + nwGUI._appFocusChanged(None, nwGUI.docEditor) + + def mockEmitViewerFocus(*a): + nwGUI._appFocusChanged(None, nwGUI.docViewer) + + # Switch to viewer + with monkeypatch.context() as mp: + mp.setattr(nwGUI.docEditor, "hasFocus", lambda *a: True) + mp.setattr(nwGUI.docViewer, "hasFocus", lambda *a: False) + mp.setattr(nwGUI.docEditor, "setFocus", mockEmitEditorFocus) + mp.setattr(nwGUI.docViewer, "setFocus", mockEmitViewerFocus) + nwGUI._switchFocus(nwFocus.DOCUMENT) + assert nwGUI.docEditor.docHeader.itemTitle._state is False + assert nwGUI.docViewer.docHeader.itemTitle._state is True + + # Call again to switch to editor + with monkeypatch.context() as mp: + mp.setattr(nwGUI.docEditor, "hasFocus", lambda *a: False) + mp.setattr(nwGUI.docViewer, "hasFocus", lambda *a: True) + mp.setattr(nwGUI.docEditor, "setFocus", mockEmitEditorFocus) + mp.setattr(nwGUI.docViewer, "setFocus", mockEmitViewerFocus) + nwGUI._switchFocus(nwFocus.DOCUMENT) + assert nwGUI.docEditor.docHeader.itemTitle._state is True + assert nwGUI.docViewer.docHeader.itemTitle._state is False + + # Default to editor + with monkeypatch.context() as mp: + mp.setattr(nwGUI.docEditor, "hasFocus", lambda *a: False) + mp.setattr(nwGUI.docViewer, "hasFocus", lambda *a: False) + mp.setattr(nwGUI.docEditor, "setFocus", mockEmitEditorFocus) + mp.setattr(nwGUI.docViewer, "setFocus", mockEmitViewerFocus) + nwGUI._switchFocus(nwFocus.DOCUMENT) + assert nwGUI.docEditor.docHeader.itemTitle._state is True + assert nwGUI.docViewer.docHeader.itemTitle._state is False + + # Focus Outline + # ============= + nwGUI._switchFocus(nwFocus.OUTLINE) + assert nwGUI.mainStack.currentWidget() == nwGUI.outlineView + + # Pass Actions + # ============ + + # Pass to editor + with monkeypatch.context() as mp: + mp.setattr(nwGUI.docEditor, "hasFocus", lambda *a: True) + mp.setattr(nwGUI.docViewer, "hasFocus", lambda *a: False) + nwGUI._passDocumentAction(nwDocAction.SEL_ALL) + assert nwGUI.docEditor.textCursor().hasSelection() is True + + # Pass to viewer + with monkeypatch.context() as mp: + mp.setattr(nwGUI.docEditor, "hasFocus", lambda *a: False) + mp.setattr(nwGUI.docViewer, "hasFocus", lambda *a: True) + nwGUI._passDocumentAction(nwDocAction.SEL_ALL) + assert nwGUI.docViewer.textCursor().hasSelection() is True + + # qtbot.stop() From d07543926f5c8dea198b43a88dac2e452b5dc0c2 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Fri, 21 Jun 2024 00:18:10 +0200 Subject: [PATCH 30/67] Disable failing fast in Linux test matrix --- .github/workflows/test_linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test_linux.yml b/.github/workflows/test_linux.yml index 9112966e..897d1c0e 100644 --- a/.github/workflows/test_linux.yml +++ b/.github/workflows/test_linux.yml @@ -15,6 +15,7 @@ jobs: strategy: matrix: python-version: ["3.9", "3.10", "3.11", "3.12"] + fail-fast: false runs-on: ubuntu-latest steps: - name: Python Setup From 802069b4e572e3a5649b3eef315f04ebefdf666f Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Fri, 21 Jun 2024 00:21:45 +0200 Subject: [PATCH 31/67] Try adding deleteLater to i18n test --- tests/test_gui/test_gui_i18n.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_gui/test_gui_i18n.py b/tests/test_gui/test_gui_i18n.py index 83638f13..f41d0970 100644 --- a/tests/test_gui/test_gui_i18n.py +++ b/tests/test_gui/test_gui_i18n.py @@ -64,6 +64,8 @@ def testGuiI18n_Localisation(qtbot, monkeypatch, language, nwGUI, projPath): qtbot.waitUntil(lambda: SHARED.findTopLevelWidget(dType) is not None, timeout=1000) dialog = SHARED.findTopLevelWidget(dType) assert isinstance(dialog, dType) + assert dialog is not None + dialog.deleteLater() showDialog(nwGUI.showWelcomeDialog, GuiWelcome) showDialog(nwGUI.showPreferencesDialog, GuiPreferences) From 516db26c05ce961303f9d5f4d6ec0f4afdcfc7b7 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Fri, 21 Jun 2024 00:33:22 +0200 Subject: [PATCH 32/67] Add latest change to the changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34c81310..4b24f179 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,10 @@ backups. PR #1936. * When a new note is created from a reference tag in the editor, the syntax highlighting is properly updated to indicate the tag is now valid. Issue #1916. PR #1938. +* The `Ctrl+E` shortcut now toggles focus between editor and viewer instead of just going to the + editor. The header text colour changes to indicate which panel has focus. This should make it + easier to scroll the content of the viewer without having to click it with the mouse first. + Issue #1387. PR #1940. **Code Improvements** From 1e6377abaa3f636c2a107a7d585943d50491b83a Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Fri, 21 Jun 2024 00:35:28 +0200 Subject: [PATCH 33/67] Revert font setting from SHARED instance in colour label, which caused some weird issues --- novelwriter/extensions/configlayout.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/novelwriter/extensions/configlayout.py b/novelwriter/extensions/configlayout.py index 3bb7b289..53354b4b 100644 --- a/novelwriter/extensions/configlayout.py +++ b/novelwriter/extensions/configlayout.py @@ -34,7 +34,7 @@ from PyQt5.QtWidgets import ( QVBoxLayout, QWidget ) -from novelwriter import CONFIG, SHARED +from novelwriter import CONFIG DEFAULT_SCALE = 0.9 @@ -266,7 +266,7 @@ class NColourLabel(QLabel): self._color = color or default self._faded = faded or default - font = SHARED.theme.guiFont + font = self.font() font.setPointSizeF(scale*font.pointSizeF()) font.setWeight(QFont.Weight.Bold if bold else QFont.Weight.Normal) if color: From 18f5deee826f8920e2ea25364448ec4cccd93f84 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 22 Jun 2024 14:17:44 +0200 Subject: [PATCH 34/67] Change release date and extend changelog --- CHANGELOG.md | 4 ++-- novelwriter/__init__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b24f179..cec85c94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # novelWriter Changelog -## Version 2.5 RC 1 [2024-06-18] +## Version 2.5 RC 1 [2024-06-22] ### Release Notes @@ -42,7 +42,7 @@ backups. * The `Ctrl+E` shortcut now toggles focus between editor and viewer instead of just going to the editor. The header text colour changes to indicate which panel has focus. This should make it easier to scroll the content of the viewer without having to click it with the mouse first. - Issue #1387. PR #1940. + Issue #1387. PRs #1940 and #1941. **Code Improvements** diff --git a/novelwriter/__init__.py b/novelwriter/__init__.py index 6dc0b942..8a81ae2c 100644 --- a/novelwriter/__init__.py +++ b/novelwriter/__init__.py @@ -49,7 +49,7 @@ __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" __version__ = "2.5rc1" __hexversion__ = "0x020500c1" -__date__ = "2024-06-18" +__date__ = "2024-06-22" __status__ = "Stable" __domain__ = "novelwriter.io" From b5ef62194d5e876ec9e5503dd2bd0f96cf9531e2 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 22 Jun 2024 15:02:29 +0200 Subject: [PATCH 35/67] Update i18n files --- i18n/nw_base.ts | 2036 ++++++++++++++++++++++++-------------------- i18n/nw_de_DE.ts | 2048 ++++++++++++++++++++++++--------------------- i18n/nw_en_US.ts | 2048 ++++++++++++++++++++++++--------------------- i18n/nw_es_419.ts | 2048 ++++++++++++++++++++++++--------------------- i18n/nw_fr_FR.ts | 2048 ++++++++++++++++++++++++--------------------- i18n/nw_it_IT.ts | 2048 ++++++++++++++++++++++++--------------------- i18n/nw_ja_JP.ts | 2048 ++++++++++++++++++++++++--------------------- i18n/nw_nb_NO.ts | 2048 ++++++++++++++++++++++++--------------------- i18n/nw_nl_NL.ts | 2048 ++++++++++++++++++++++++--------------------- i18n/nw_pt_BR.ts | 2048 ++++++++++++++++++++++++--------------------- i18n/nw_zh_CN.ts | 2048 ++++++++++++++++++++++++--------------------- 11 files changed, 12270 insertions(+), 10246 deletions(-) diff --git a/i18n/nw_base.ts b/i18n/nw_base.ts index 6161430d..eb56db38 100644 --- a/i18n/nw_base.ts +++ b/i18n/nw_base.ts @@ -4,232 +4,242 @@ Builds - + Document Filters - + Novel Documents - + Project Notes - + Inactive Documents - + Headings - + Partition Format - + Chapter Format - + Unnumbered Format - + Scene Format - + Alt. Scene Format - + Section Format - + Text Content - + Include Synopsis - + Include Comments - + Include Keywords - + Include Body Text - + Ignore These Keywords - + Insert Content - + Add Titles for Notes - + Text Format - - - Font Family - - - - - Font Size - - - Line Height + Text Font - Text Options + Line Height - Justify Text Margins + Text Options - Replace Unicode Characters + Justify Text Margins - Replace Tabs with Spaces + Replace Unicode Characters - Page Layout + Replace Tabs with Spaces - Unit - - - - - Page Size - - - - - Page Width - - - - - Page Height - - - - - Top Margin - - - - - Bottom Margin - - - - - Left Margin - - - - - Right Margin - - - - - Open Document (.odt) - - - - - Add Highlight Colours - - - - - Page Header - - - - - Page Counter Offset - - - - - First Line Indent - - - - - Markdown (.md) - - - - Preserve Hard Line Breaks + + + Apply Dialogue Highlighting + + + + + First Line Indent + + + + + Enable Indent + + + + + Indent Width + + + + + Indent First Paragraph + + + + + Page Layout + + + + + Unit + + + + + Page Size + + + + + Page Width + + + + + Page Height + + + + + Top Margin + + + + + Bottom Margin + + + + + Left Margin + + + + + Right Margin + + - HTML (.html) + Open Document (.odt) - Add CSS Styles + Add Highlight Colours + Page Header + + + + + Page Counter Offset + + + + + HTML (.html) + + + + + Add CSS Styles + + + + Preserve Tab Characters @@ -237,72 +247,72 @@ Common - + in the future - + just now - + a minute ago - + {0} minutes ago - + an hour ago - + {0} hours ago - + a day ago - + {0} days ago - + a week ago - + {0} weeks ago - + a month ago - + {0} months ago - + a year ago - + {0} years ago @@ -310,375 +320,475 @@ Constant - - - + + + None - + Novel - - + + Plot - - + + Characters - - + + Locations - - + + Timeline - - + + Objects - - + + Entities - - - + + + Custom - + Archive - + Templates - + 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 - + Open Document (.odt) - + Flat Open Document (.fodt) - + novelWriter HTML (.html) - + novelWriter Markup (.txt) - + Standard Markdown (.md) - + Extended Markdown (.md) - + JSON + novelWriter HTML (.json) - + JSON + novelWriter Markup (.json) + + + Square + + + + + Triangle + + + + + Nabla + + + + + Diamond + + + + + Pentagon + + + + + Hexagon + + - Text files + Star - Markdown files - - - - - novelWriter files - - - - - CSV files + Pacman - All files + 1/4 Circle + + + + + Half Circle + + + + + 3/4 Circle - Millimetres + Full Circle - - Centimetres + + 1 Bar - - Inches + + 2 Bars + + + + + 3 Bars + + + + + 4 Bars + + + + + 1 Block - A4 + 2 Blocks - A5 + 3 Blocks + 4 Blocks + + + + + Text files + + + + + Markdown files + + + + + novelWriter files + + + + + CSV files + + + + + All files + + + + + Millimetres + + + + + Centimetres + + + + + Inches + + + + + A4 + + + + + A5 + + + + A6 - + US Legal - + US Letter - + 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 @@ -704,38 +814,38 @@ GuiBuildSettings - - + + Manuscript Build Settings - + Name - + Selection - + Headings - + Content - + Format - + Output @@ -783,7 +893,7 @@ - + Added: {0} [{1}B] @@ -791,22 +901,22 @@ GuiDocEditFooter - + Line: {0} ({1}) - + Words: {0} ({1}) - + Words: {0} selected - + Status @@ -814,27 +924,27 @@ GuiDocEditHeader - + Toggle Tool Bar - + Outline - + Search - + Toggle Focus Mode - + Close @@ -842,62 +952,62 @@ GuiDocEditSearch - + Search for - + Replace with - + Search - + 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 @@ -905,122 +1015,122 @@ GuiDocEditor - + Opened Document: {0} - + 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 - + Document Details - + Created: {0} - + Updated: {0} - + File Location: {0} - + Set as Document Name - + Follow Tag - + Create Note for 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. - + Do you want to create a new project note for the tag '{0}'? @@ -1104,52 +1214,52 @@ GuiDocToolBar - + Markdown Bold - + Markdown Italic - + Markdown Strikethrough - + Shortcode Bold - + Shortcode Italic - + Shortcode Strikethrough - + Shortcode Underline - + Shortcode Highlight - + Shortcode Superscript - + Shortcode Subscript @@ -1157,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel - + Comments - + Show Comments - + Synopsis - + Show Synopsis Comments @@ -1185,27 +1295,27 @@ GuiDocViewHeader - + Outline - + Go Backward - + Go Forward - + Reload - + Close @@ -1213,27 +1323,27 @@ GuiDocViewer - + An error occurred while generating the preview. - + Copy - + Select All - + Select Word - + Select Paragraph @@ -1254,12 +1364,12 @@ GuiEditLabel - + Item Label - + Label @@ -1267,37 +1377,37 @@ GuiItemDetails - + Label - + Status - + Class - + Usage - + Characters - + Words - + Paragraphs @@ -1305,27 +1415,27 @@ GuiLipsum - + Insert Placeholder Text - + Insert Lorem Ipsum Text - + Number of paragraphs - + Randomise order - + Insert @@ -1333,78 +1443,78 @@ GuiMain - + novelWriter is ready ... - + You are now running novelWriter version {0}. - + Please check the {0}release notes{1} for further details. - + Close the current project? - - + + Changes are saved automatically. - + Backup the current project? - + 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 was locked by the computer '{0}' ({1} {2}), last active on {3}. - + The project index is outdated or broken. Rebuilding index. - + Import File - + Could not read file. The file must be an existing text file. - + Please open a document to import the text file into. - + Importing the file will overwrite the current content of the document. Do you want to proceed? - + Indexing completed in {0} ms @@ -1414,22 +1524,22 @@ - + Could not initialise the dialog. - + Do you want to exit novelWriter? - + Some changes will not be applied until novelWriter has been restarted. - + 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}. @@ -1573,12 +1683,12 @@ - Go to Project Tree + Go to Tree View - Go to Document Editor + Go to Document @@ -1797,297 +1907,302 @@ - + + Footnote + + + + &Format - + Bold - + Italic - + Strikethrough - + Wrap Double Quotes - + Wrap Single Quotes - + More Formats ... - + Bold (Shortcode) - + Italics (Shortcode) - + Strikethrough (Shortcode) - + Underline - + Highlight - + Superscript - + Subscript - + Heading 1 (Partition) - + Heading 2 (Chapter) - + Heading 3 (Scene) - + Heading 4 (Section) - + Novel Title - + Unnumbered Chapter - + Alternative Scene - + Align Left - + Align Centre - + Align Right - + Indent Left - + Indent Right - + Toggle Comment - + Toggle Ignore Text - + Remove Block Format - + Replace Straight Single Quotes - + Replace Straight Double Quotes - + Remove In-Paragraph Breaks - + &Search - + Find - + Replace - + Find Next - + Find Previous - + Replace Next - + Find in Project - + &Tools - + Check Spelling - + Spell Check Language - + Default - + Re-Run Spell Check - + Project Word List - + Add Dictionaries - + Rebuild Index - + Backup Project - + Build Manuscript - + Writing Statistics - + Preferences - + &Help - + About novelWriter - + About Qt5 - + User Manual (Online) - + User Manual (PDF) - + Report an Issue (GitHub) - + Ask a Question (GitHub) - + The novelWriter Website @@ -2096,22 +2211,22 @@ GuiMainStatus - + None - + Editor - + Project - + Session Time @@ -2134,63 +2249,63 @@ GuiManuscript - + Build Manuscript - + Add New Build - + Delete Selected Build - + Edit Selected Build - + Builds - + Details - + Outline - + Preview - + Print - + Build - + Close - - + + My Manuscript @@ -2256,18 +2371,18 @@ GuiNovelDetails - - + + Novel Details - + Overview - + Contents @@ -2275,58 +2390,58 @@ GuiNovelToolBar - + Outline of {0} - + Novel Root - + Refresh - + Last Column - + Hidden - + Point of View Character - + Focus Character - + Novel Plot - - + + Column Size - + More Options - + Maximum column size in % @@ -2334,7 +2449,7 @@ GuiNovelTree - + No meta data @@ -2342,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title - + Chapter - + Scene - + Section - + Document - + Status - + Characters - + Words - + Paragraphs - + Synopsis - + Title Details - + Reference Tags @@ -2407,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns @@ -2415,17 +2530,17 @@ GuiOutlineToolBar - + Outline of - + Refresh - + Export CSV @@ -2433,7 +2548,7 @@ GuiOutlineTree - + Save Outline As @@ -2441,553 +2556,589 @@ GuiPreferences - - + + Preferences - + Search - + General - + Appearance - + Display language - - - + + Requires restart to take effect. - + Colour theme - + General colour theme and icons. - - Application font family + + Application font - - Application font size - - - - - - pt - - - - + Hide vertical scroll bars in main windows - - + + Scrolling available with mouse wheel and keys only. - + Hide horizontal scroll bars in main windows + + + Use the system's font selection dialog + + + Turn off to use the Qt font dialog, which may have more options. + + + + Document Style - + Document colour theme - + Colour theme for the editor and viewer. - - Document font family + + Document font - - - - + + + Applies to both document editor and viewer. - - Document font size - - - - + Emphasise partition and chapter labels - + Makes them stand out in the project tree. - + Show full path in document header - + Add the parent folder names to the header. - + Include project notes in status bar word count - + Auto Save - + Save document interval - + How often the document is automatically saved. - - + + seconds - + Save project interval - + How often the project is automatically saved. - + Project Backup - + Browse - + Backup storage location - - + + Path: {0} - + Run backup when the project is closed - + Can be overridden for individual projects in Project Settings. - + Ask before running backup - + If off, backups will run in the background. - + Session Timer - + Pause the session timer when not writing - + Also pauses when the application window does not have focus. - + Editor inactive time before pausing timer - + User activity includes typing and changing the content. - + minutes - + Writing - + Text Flow - + Maximum text width in "Normal Mode" - + Set to 0 to disable this feature. - - - - + + + + px - + Maximum text width in "Focus Mode" - + The maximum width cannot be disabled. - + Hide document footer in "Focus Mode" - + Hide the information bar in the document editor. - + Justify the text margins - + Minimum text margin - + Tab width - + The width of a tab key press in the editor and viewer. - + Text Editing - + Spell check language - + Available languages are determined by your system. - + Auto-select word under cursor - + Apply formatting to word under cursor if no selection is made. - + Show tabs and spaces - + Show line endings - + Editor Scrolling - + Scroll past end of the document - + Also centres the cursor when scrolling. - + Typewriter style scrolling when you type - + Keeps the cursor at a fixed vertical position. - + Minimum position for Typewriter scrolling - + Percentage of the editor height from the top. - + Text Highlighting - - Highlight text wrapped in quotes + + None - - - - Applies to the document editor only. + + Single Quotes + + + + + Double Quotes + + + + + Both + + + + + Highlight dialogue + + + + + Applies to the selected quote styles. + + + + + Allow open-ended dialogue - Allow open-ended single quotes + Highlight dialogue line with no closing quote. - - Highlight single-quoted line with no closing quote. + + Dialogue narrator break symbol - - Allow open-ended double quotes + + Symbol to indicate injected narrator break. - - Highlight double-quoted line with no closing quote. + + Dialogue line symbol - + + Lines starting with this symbol are dialogue. + + + + + Alternative dialogue symbols + + + + + Custom highlighting of dialogue text. + + + + Add highlight colour to emphasised text - + + + Applies to the document editor only. + + + + Highlight multiple or trailing spaces - + Text Automation - + Auto-replace text as you type - + Allow the editor to replace symbols as you type. - + Auto-replace single quotes - - + + Try to guess which is an opening or a closing quote. - + Auto-replace double quotes - + Auto-replace dashes - + Double and triple hyphens become short and long dashes. - + Auto-replace dots - + Three consecutive dots become ellipsis. - + Insert non-breaking space before - + Automatically add space before any of these symbols. - + Insert non-breaking space after - + Automatically add space after any of these symbols. - + Use thin space instead - + Inserts a thin space instead of a regular space. - + Quotation Style - + Single quote open style - + The symbol to use for a leading single quote. - + Single quote close style - + The symbol to use for a trailing single quote. - + Double quote open style - + The symbol to use for a leading double quote. - + Double quote close style - + The symbol to use for a trailing double quote. - + Backup Directory @@ -3023,28 +3174,28 @@ GuiProjectSettings - - + + Project Settings - + Settings - + Status - + Importance - + Auto-Replace @@ -3052,47 +3203,47 @@ GuiProjectToolBar - + Project Content - + Quick Links - + Move Up - + Move Down - + Add Item - + Expand All - + Collapse All - + Empty Trash - + More Options @@ -3100,122 +3251,130 @@ GuiProjectTree - + Active - + Inactive - + Permanently delete {0} file(s) from Trash? - + Did not find anywhere to add the file or folder! - + Cannot add new files or folders to the Trash folder. - + New Note - + New Chapter - + New Scene - + New Document - + New Folder - + There is currently no Trash folder in this project. - + The Trash folder is already empty. - + Move '{0}' to Trash? - + Root folders can only be deleted when they are empty. - + Permanently delete '{0}'? - + Drag and drop is only allowed for single items, non-root items, or multiple items with the same parent. - + No documents selected for merging. - + Merged - - + + Could not write document content. - + Do you want to duplicate this document? - + Do you want to duplicate this item and all child items? - + Could not duplicate all items. - + There is nowhere to add item with name '{0}'. + + GuiQuoteSelect + + + Select Quote Style + + + GuiSideBar @@ -3300,33 +3459,33 @@ GuiWordList - - + + Project Word List - + Import words from text file - + Export words to text file - + Note: The import file must be a plain text file with UTF-8 or ASCII encoding. - + Import File - + Export File @@ -3334,147 +3493,147 @@ GuiWritingStats - + Writing Statistics - + Session Start - + Length - + Idle - + Words - + Histogram - + Sum Totals - + Total Time: - + Idle Time: - + Filtered Time: - + Novel Word Count: - + Notes Word Count: - + Total Word Count: - + Filters - + Count novel files - + Count note files - + Hide zero word count - + Hide negative word count - + Group entries by day - + Show idle time - + Word count cap for the histogram - + Save As - + JSON Data File (.json) - + CSV Data File (.csv) - + JSON Data File - + CSV Data File - + Save Data As - + {0} file successfully written to: - + Failed to write {0} file. @@ -3482,153 +3641,153 @@ NWProject - + Could not delete document file. - + Not a known project file format. - + Project file not found. - + Failed to open project. - + 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. - + 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? - + 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? - + Recovered - + Found {0} orphaned file(s) in the project. {1} file(s) were recovered. - + Opened Project: {0} - + There is no project open. - + Failed to save project. - + Saved Project: {0} - + Backing up project ... - + Cannot backup project because no project name is set. Please set a Project Name in Project Settings. - + Could not create backup folder. - + Created a backup of your project of size {0}B. - + Path: {0} - + Could not write backup archive. - + Project backed up to '{0}' - - + + New - + Note - + Draft - + Finished - + Minor - + Major - + Main @@ -3644,89 +3803,89 @@ ProjectBuilder - + The target folder is not empty. Please choose another folder. - + An error occurred while trying to create the project. - + New Project - + Title Page - + By - + Summary of the chapter. - + Summary of the scene. - + A short description. - + Chapter {0} - - + + Scene {0} - + Main Plot - + Protagonist - + Main Location - - + + The target folder already exists. Please choose another folder. - + Could not copy project files. - + Failed to create a new example project. - + Failed to create a new example project. Could not find the necessary files. They seem to be missing from this installation. @@ -3863,20 +4022,25 @@ SharedData - + novelWriter Project File or Zip File - + novelWriter Project File - + Open Project + + + Select Font + + VersionInfoWidget @@ -3924,57 +4088,57 @@ _ContentsPage - + Table of Contents - + Title - + Words - + Pages - + Page - + Progress - + Words per page - + First page offset - + Chapters on odd pages - + Untitled - + END @@ -3982,32 +4146,32 @@ _DetailsWidget - + Setting - + Value - + Name - + Selection - + Title - + Hidden @@ -4015,37 +4179,37 @@ _FilterTab - + Included in manuscript - + Excluded from manuscript - + Always included - + Always excluded - + Reset to default - + Mark selection as - + Select Root Folders @@ -4053,22 +4217,22 @@ _GuiAlert - + Information - + Warning - + Error - + Question @@ -4076,93 +4240,93 @@ _HeadingsTab - + Hide - - + + Editing: {0} - - + + None - + Title - + Chapter Number - + Chapter Number (Word) - + Chapter Number (Upper Case Roman) - + Chapter Number (Lower Case Roman) - + Scene Number (In Chapter) - + Scene Number (Absolute) - + Point of View Character - + Focus Character - + Insert - + Apply - + Additional Styling - - - + + + Centre - - - + + + Page Break @@ -4170,117 +4334,117 @@ _NewProjectForm - + Required - + Optional - + Create a fresh project - + Create an example project - + Copy an existing project - + Project Name - + Author - + Project Path - + Prefill Project - + Set to 0 to only add scenes - + Add {0} chapter documents - + Add {0} scene documents (to each chapter) - + Add a folder for plot notes - + Add a folder for character notes - + Add a folder for location notes - + Add example notes to the above - + Chapters and Scenes - + Project Notes - + Create New Project - + Select Project Folder - + Fresh Project - + Example Project - + Template: {0} @@ -4288,7 +4452,7 @@ _NewProjectPage - + A project name is required. @@ -4296,27 +4460,27 @@ _OpenProjectPage - + The project path is not reachable. - + Path - + Remove '{0}' from the recent projects list? The project files will not be deleted. - + Open Project - + Remove Project @@ -4324,54 +4488,54 @@ _OverviewPage - + Project - - + + Name - + Revisions - + Editing Time - - + + Word Count - + In Novels - + In Notes - + Selected Novel - + Chapters - + Scenes @@ -4379,40 +4543,40 @@ _PreviewWidget - + Press the "Preview" button to generate ... - + Processing ... - + Done - - Unknown + + Built - - Built + + No Preview _ProjectListModel - + Word Count - + Last Opened @@ -4420,77 +4584,77 @@ _ReplacePage - + Text Auto-Replace for Preview and Build - + Keyword - + Replace With - + Select item to edit - - Save + + Apply _SettingsPage - + Project name - + Changing this will affect the backup path. - + Author(s) - - + + Only used when building the manuscript. - + Project language - + Default - + Spell check language - - + + Overrides main preferences. - + Disable backup on close @@ -4498,59 +4662,59 @@ _StatsWidget - - + + Words - - + + Characters - + Words in Headings - + Words in Text - + Headings - + Paragraphs - + Characters in Headings - + Characters in Text - + Characters, No Spaces - + Characters in Headings, No Spaces - + Characters in Text, No Spaces @@ -4558,196 +4722,216 @@ _StatusPage - + Novel Document Status Levels - + Project Note Importance Levels - - Label - - - - - Usage - - - - - Select item to edit - - - - - Colour - - - - - Save - - - - - Select Colour - - - - - New Item - - - - - Cannot delete a status item that is in use. - - - - + Not in use - + Used once - + Used by {0} items + + + Select Colour + + + + + Label + + + + + Usage + + + + + Select item to edit + + + + + Colour + + + + + Circles ... + + + + + Bars ... + + + + + Blocks ... + + + + + Shape + + + + + Apply + + + + + New Item + + + + + Cannot delete a status item that is in use. + + _TreeContextMenu - + Empty Trash - + Rename - + Open Document - + View Document - + Create New ... - + Rename to Heading - + Set Active to ... - + Toggle Active - + Set Status to ... - - + + Manage Labels ... - + Set Importance to ... - + Transform ... - - - - + + + + Convert to {0} - + Merge Child Items into Self - + Merge Child Items into New - + Merge Documents in Folder - + Split Document by Headings - + Expand All - + Collapse All - + Duplicate - - + + Delete Permanently - - + + Move to Trash - + Move {0} items to Trash? - + Do you want to convert the folder to a {0}? This action cannot be reversed. @@ -4755,7 +4939,7 @@ _UpdatableMenu - + From Template @@ -4763,12 +4947,12 @@ _ViewPanelBackRefs - + Document - + First Heading @@ -4776,27 +4960,27 @@ _ViewPanelKeyWords - + Tag - + Importance - + Document - + Heading - + Short Description diff --git a/i18n/nw_de_DE.ts b/i18n/nw_de_DE.ts index c50a9575..53382565 100644 --- a/i18n/nw_de_DE.ts +++ b/i18n/nw_de_DE.ts @@ -4,232 +4,242 @@ Builds - + Document Filters Dokumentenfilter - + Novel Documents Romandokumente - + Project Notes Projektnotizen - + Inactive Documents Inaktive Dokumente - + Headings Überschriften - + Partition Format Teil - + Chapter Format Kapitel - + Unnumbered Format Kapitel (Unnummeriert) - + Scene Format Szene - + Alt. Scene Format Szene (Variante) - + Section Format Abschnitt - + Text Content Textinhalt - + Include Synopsis Zusammenfassung - + Include Comments Kommentare - + Include Keywords Schlagwörter - + Include Body Text Fließtext - + Ignore These Keywords Diese Schlagwörter ignorieren - + Insert Content Inhalte einfügen - + Add Titles for Notes Titel für Notizen einfügen - + Text Format Textformatierung - - - Font Family - Schriftart - - - - Font Size - Schriftgröße - + Text Font + + + + Line Height Zeilenhöhe - + Text Options Textoptionen - + Justify Text Margins Blocksatz - + Replace Unicode Characters Unicode ersetzen - + Replace Tabs with Spaces Tabs durch Leerzeichen ersetzen - - - Page Layout - Seitenlayout - - Unit - Einheit - - - - Page Size - Seitenformat - - - - Page Width - Seitenbreite - - - - Page Height - Seitenhöhe - - - - Top Margin - Abstand oben - - - - Bottom Margin - Abstand unten - - - - Left Margin - Abstand links - - - - Right Margin - Abstand rechts - - - - Open Document (.odt) - Open Document (.odt) - - - - Add Highlight Colours - Hervorhebungsfarben hinzufügen - - - - Page Header - Kopfzeile - - - - Page Counter Offset - Seitenzahl-Offset - - - - First Line Indent - Erste Zeile einrücken - - - - Markdown (.md) - Markdown (.md) - - - Preserve Hard Line Breaks Harte Zeilenumbrüche behalten + + + Apply Dialogue Highlighting + + + + + First Line Indent + Erste Zeile einrücken + + + + Enable Indent + + + + + Indent Width + + + + + Indent First Paragraph + + + + + Page Layout + Seitenlayout + + + + Unit + Einheit + + + + Page Size + Seitenformat + + + + Page Width + Seitenbreite + + + + Page Height + Seitenhöhe + + + + Top Margin + Abstand oben + + + + Bottom Margin + Abstand unten + + + + Left Margin + Abstand links + + + + Right Margin + Abstand rechts + + Open Document (.odt) + Open Document (.odt) + + + + Add Highlight Colours + Hervorhebungsfarben hinzufügen + + + + Page Header + Kopfzeile + + + + Page Counter Offset + Seitenzahl-Offset + + + HTML (.html) HTML (.html) - + Add CSS Styles CSS hinzufügen - + Preserve Tab Characters Tabs behalten @@ -237,72 +247,72 @@ Common - + in the future in der Zukunft - + just now gerade eben - + a minute ago vor einer Minute - + {0} minutes ago {0} Minuten her - + an hour ago eine Stunde her - + {0} hours ago {0} Stunden her - + a day ago einen Tag her - + {0} days ago {0} Tage her - + a week ago eine Woche her - + {0} weeks ago {0} Wochen her - + a month ago einen Monat her - + {0} months ago {0} Monate her - + a year ago ein Jahr her - + {0} years ago {0} Jahre her @@ -310,375 +320,475 @@ Constant - - - + + + None Ohne - + Novel Roman - - + + Plot Handlungen - - + + Characters Figuren - - + + Locations Schauplätze - - + + Timeline Zeitleiste - - + + Objects Objekte - - + + Entities Organisationen - - - + + + Custom Benutzerdefiniert - + Archive Archiv - + Templates Vorlagen - + Trash Papierkorb - - + + Novel Document Romandokument - - + + Project Note Projektnotiz - + Root Folder Hauptordner - + Folder Ordner - + Novel Title Page Romantitel - + Novel Chapter Kapitel - + Novel Scene Szene - + Novel Section Romanabschnitt - + Tag Schlagwort - + Point of View Perspektive - - + + Focus Mittelpunkt - + Title Titel - + Level Ebene - + Document Dokument - + Line Zeile - + Chars Zeichen - + Words Wörter - + Pars Absätze - + POV Perspektive - + Synopsis Zusammenfassung - + Open Document (.odt) Open Document (.odt) - + Flat Open Document (.fodt) Flat Open Document (.fodt) - + novelWriter HTML (.html) novelWriter-HTML (.html) - + novelWriter Markup (.txt) novelWriter-Markup (.txt) - + Standard Markdown (.md) Standard-Markdown (.md) - + Extended Markdown (.md) Erweitertes Markdown (.md) - + JSON + novelWriter HTML (.json) JSON + NovelWriter-HTML (.json) - + JSON + novelWriter Markup (.json) JSON + novelWriter-Markup (.json) + + + Square + + + + + Triangle + + + + + Nabla + + + + + Diamond + + + + + Pentagon + + + + + Hexagon + + + Star + + + + + Pacman + + + + + 1/4 Circle + + + + + Half Circle + + + + + 3/4 Circle + + + + + Full Circle + + + + + 1 Bar + + + + + 2 Bars + + + + + 3 Bars + + + + + 4 Bars + + + + + 1 Block + + + + + 2 Blocks + + + + + 3 Blocks + + + + + 4 Blocks + + + + Text files Textdateien - + Markdown files Markdown-Dateien - + novelWriter files novelWriter-Dateien - + CSV files CSV-Dateien - + All files Alle Dateien - + Millimetres Millimeter - + Centimetres Zentimeter - + Inches Zoll - + A4 A4 - + A5 A5 - + A6 A6 - + US Legal US Legal - + US Letter US Letter - + Straight single quotation mark Einfaches gerades Anführungszeichen - + Straight double quotation mark Doppeltes gerades Anführungszeichen - + Left single quotation mark Einfaches Anführungszeichen 6 oben - + Right single quotation mark Einfaches Anführungszeichen 9 oben - + Single low-9 quotation mark Einfaches Anführungszeichen 9 unten - + Single high-reversed-9 quotation mark Einfaches Anführungszeichen gespiegelte 9 oben - + Left double quotation mark Doppeltes Anführungszeichen 6 oben - + Right double quotation mark Doppeltes Anführungszeichen 9 oben - + Double low-9 quotation mark Doppeltes Anführungszeichen 9 unten - + Double high-reversed-9 quotation mark Doppeltes Anführungszeichen gespiegelte 9 oben - + Double low-reversed-9 quotation mark Doppeltes Anführungszeichen gespiegelte 9 unten - + Single left-pointing angle quotation mark Einfaches Guillemet linkszeigend - + Single right-pointing angle quotation mark Einfaches Guillemet rechtszeigend - + Double left-pointing angle quotation mark Doppeltes Guillemet linkszeigend - + Double right-pointing angle quotation mark Doppeltes Guillemet rechtszeigend - + Left corner bracket Linke Eckklammer - + Right corner bracket Rechte Eckklammer - + Left white corner bracket Linke weiße Eckklammer - + Right white corner bracket Rechte weiße Eckklammer @@ -704,38 +814,38 @@ GuiBuildSettings - - + + Manuscript Build Settings Buildeinstellungen - + Name Name - + Selection Auswahl - + Headings Überschriften - + Content Inhalt - + Format Format - + Output Ausgabe @@ -783,7 +893,7 @@ Wörterbuchdatei konnte nicht verarbeitet werden - + Added: {0} [{1}B] Hinzugefügt: {0} [{1}B] @@ -791,22 +901,22 @@ GuiDocEditFooter - + Line: {0} ({1}) Zeile: {0} ({1}) - + Words: {0} ({1}) Wörter: {0} ({1}) - + Words: {0} selected Wörter: {0} markiert - + Status Status @@ -814,27 +924,27 @@ GuiDocEditHeader - + Toggle Tool Bar Werkzeugleiste ein/aus - + Outline Gliederung - + Search Suche - + Toggle Focus Mode Ablenkungsfrei ein/aus - + Close Schließen @@ -842,62 +952,62 @@ GuiDocEditSearch - + Search for Suchen nach - + Replace with Ersetzen durch - + Search Suchen - + Case Sensitive Groß-/Kleinschreibung beachten - + Whole Words Only Nur ganze Wörter - + RegEx Mode RegEx-Modus - + Loop Search Suche am Anfang fortsetzen - + Search Next File Nächstes Dokument durchsuchen - + Preserve Case Groß-/Kleinschreibung beibehalten - + Close Search Suche schließen - + Find in current document Im geöffneten Dokument suchen - + Find and replace in current document Im geöffneten Dokument suchen und ersetzen @@ -905,122 +1015,122 @@ GuiDocEditor - + Opened Document: {0} Dokument geöffnet: {0} - + This document has been changed outside of novelWriter while it was open. Overwrite the file on disk? Dieses Dokument wurde außerhalb von novelWriter geändert, während es hier geöffnet war. Möchten Sie die externen Änderungen überschreiben? - + Could not save document. Dokument konnte nicht gespeichert werden. - + Saved Document: {0} Dokument gespeichert: {0} - + Spell checking requires the package PyEnchant. It does not appear to be installed. Die Rechtschreibprüfung erfordert das Paket PyEnchant. Es scheint nicht installiert zu sein. - + Spell check complete Rechtschreibprüfung abgeschlossen - + Document Details Details - + Created: {0} Erstellt: {0} - + Updated: {0} Aktualisiert: {0} - + File Location: {0} Dateispeicherort: {0} - + Set as Document Name Als Dokumentname verwenden - + Follow Tag Schlagwort öffnen - + Create Note for Tag Notiz für Schlagwort erstellen - + Cut Ausschneiden - + Copy Kopieren - + Paste Einfügen - + Select All Alles markieren - + Select Word Wort markieren - + Select Paragraph Absatz markieren - + Spelling Suggestion(s) Korrekturvorschläge - + No Suggestions Keine Vorschläge - + Add Word to Dictionary Zum Wörterbuch hinzufügen - + Please select some text before calling replace quotes. Bitte markieren Sie den Text, in dem die Anführungszeichen ersetzt werden sollen. - + Do you want to create a new project note for the tag '{0}'? Möchten Sie für das Schlagwort „{0}“ eine neue Projektnotiz erstellen? @@ -1104,52 +1214,52 @@ GuiDocToolBar - + Markdown Bold Fett mit Markdown - + Markdown Italic Kursiv mit Markdown - + Markdown Strikethrough Durchgestrichen mit Markdown - + Shortcode Bold Fett mit Shortcode - + Shortcode Italic Kursiv mit Shortcode - + Shortcode Strikethrough Durchgestrichen mit Shortcode - + Shortcode Underline Unterstrichen mit Shortcode - + Shortcode Highlight Hervorheben mit Shortcode - + Shortcode Superscript Hochgestellt mit Shortcode - + Shortcode Subscript Tiefgestellt mit Shortcode @@ -1157,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel Ansichtsbereich ein-/ausblenden - + Comments Kommentare - + Show Comments Kommentare anzeigen - + Synopsis Zusammenfassung - + Show Synopsis Comments Zusammenfassung anzeigen @@ -1185,27 +1295,27 @@ GuiDocViewHeader - + Outline Gliederung - + Go Backward Zurück - + Go Forward Vor - + Reload Aktualisieren - + Close Schließen @@ -1213,27 +1323,27 @@ GuiDocViewer - + An error occurred while generating the preview. Fehler beim Erstellen der Vorschau. - + Copy Kopieren - + Select All Alles markieren - + Select Word Wort markieren - + Select Paragraph Absatz markieren @@ -1254,12 +1364,12 @@ GuiEditLabel - + Item Label Titel - + Label Name @@ -1267,37 +1377,37 @@ GuiItemDetails - + Label Name - + Status Status - + Class Gruppe - + Usage Kategorie - + Characters Zeichen - + Words Wörter - + Paragraphs Absätze @@ -1305,27 +1415,27 @@ GuiLipsum - + Insert Placeholder Text Platzhaltertext einfügen - + Insert Lorem Ipsum Text Lorem Ipsum einfügen - + Number of paragraphs Anzahl der Absätze - + Randomise order Zufällige Reihenfolge - + Insert Einfügen @@ -1333,78 +1443,78 @@ GuiMain - + novelWriter is ready ... novelWriter ist bereit ... - + You are now running novelWriter version {0}. Sie verwenden jetzt die novelWriter-Version {0}. - + Please check the {0}release notes{1} for further details. Bitte lesen Sie die {0}Versionshinweise{1} für weitere Informationen. - + Close the current project? Geöffnetes Projekt schließen? - - + + Changes are saved automatically. Alle Änderungen werden automatisch gespeichert. - + Backup the current project? Backup des geöffneten Projektes erstellen? - + The project is already open by another instance of novelWriter, and is therefore locked. Override lock and continue anyway? Das Projekt ist bereits in einer anderen Instanz von novelWriter geöffnet und daher gesperrt. Sperre aufheben und fortfahren? - + 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. Hinweis: Nach einem Computer- oder Programmabsturz können Sie die Sperre einfach überschreiben. Falls das Projekt bereits in einer anderen Instanz von novelWriter geöffnet ist, könnte ein Überschreiben der Sperre zu fehlerhaften Daten führen. - + The project was locked by the computer '{0}' ({1} {2}), last active on {3}. Projekt gesperrt von Computer '{0}' ({1} {2}), letzte Aktivität war am {3}. - + The project index is outdated or broken. Rebuilding index. Der Index ist nicht aktuell oder defekt. Index wird aktualisiert. - + Import File Textdatei importieren - + Could not read file. The file must be an existing text file. Datei konnte nicht gelesen werden. Bitte wählen Sie eine gültige Datei mit Text aus. - + Please open a document to import the text file into. Bitte öffnen Sie zuerst ein Dokument in novelWriter, in welches Sie den Text importieren möchten. - + Importing the file will overwrite the current content of the document. Do you want to proceed? Das Importieren einer Datei überschreibt den Inhalt des geöffneten Dokuments. Fortfahren? - + Indexing completed in {0} ms Index erstellt in {0} ms @@ -1414,22 +1524,22 @@ Index wurde erfolgreich aktualisiert. - + Could not initialise the dialog. Der Dialog konnte nicht gestartet werden. - + Do you want to exit novelWriter? Möchten Sie novelWriter beenden? - + Some changes will not be applied until novelWriter has been restarted. Einige Änderungen können erst nach Neustart von novelWriter angewendet werden. - + 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}. Der Verweis für das Schlagwort „{0}“ konnte nicht gefunden werden. Entweder es existiert nicht oder der Index ist veraltet. Aktualisieren Sie den Index über den Menüpunkt „Extras“ oder mit der Taste {1}. @@ -1573,13 +1683,13 @@ - Go to Project Tree - Zur Projektstruktur wechseln + Go to Tree View + - Go to Document Editor - Zum Editor wechseln + Go to Document + @@ -1797,297 +1907,302 @@ Platzhaltertext - + + Footnote + + + + &Format &Format - + Bold Fett - + Italic Kursiv - + Strikethrough Durchgestrichen - + Wrap Double Quotes Doppelte Anführungszeichen - + Wrap Single Quotes Einfache Anführungszeichen - + More Formats ... Weitere Formate ... - + Bold (Shortcode) Fett (Shortcode) - + Italics (Shortcode) Kursiv (Shortcode) - + Strikethrough (Shortcode) Durchgestrichen (Shortcode) - + Underline Unterstrichen - + Highlight Hervorheben - + Superscript Hochgestellt - + Subscript Tiefgestellt - + Heading 1 (Partition) Überschrift 1 (Teil) - + Heading 2 (Chapter) Überschrift 2 (Kapitel) - + Heading 3 (Scene) Überschrift 3 (Szene) - + Heading 4 (Section) Überschrift 4 (Abschnitt) - + Novel Title Romantitel - + Unnumbered Chapter Unnummeriertes Kapitel - + Alternative Scene Szene (Variante) - + Align Left Linksbündig - + Align Centre Zentriert - + Align Right Rechtsbündig - + Indent Left Einrückung links - + Indent Right Einrückung rechts - + Toggle Comment Kommentar ein/aus - + Toggle Ignore Text Text ignorieren ein/aus - + Remove Block Format Absatzformatierung entfernen - + Replace Straight Single Quotes Einfache gerade Anführungszeichen ersetzen - + Replace Straight Double Quotes Doppelte gerade Anführungszeichen ersetzen - + Remove In-Paragraph Breaks Zeilenumbrüche in Absätzen entfernen - + &Search &Suche - + Find Suchen - + Replace Ersetzen - + Find Next Nächstes Suchergebnis - + Find Previous Vorheriges Suchergebnis - + Replace Next Nächste Fundstelle ersetzen - + Find in Project Im Projekt suchen - + &Tools E&xtras - + Check Spelling Rechtschreibprüfung - + Spell Check Language Sprache der Rechtschreibprüfung - + Default Standard - + Re-Run Spell Check Rechtschreibprüfung wiederholen - + Project Word List Projektwörterbuch - + Add Dictionaries Wörterbücher hinzufügen - + Rebuild Index Index aktualisieren - + Backup Project Backup erstellen - + Build Manuscript Manuskript erstellen - + Writing Statistics Schreibstatistiken - + Preferences Einstellungen - + &Help &Hilfe - + About novelWriter Über novelWriter - + About Qt5 Über Qt5 - + User Manual (Online) Benutzerhandbuch (online) - + User Manual (PDF) Benutzerhandbuch (PDF) - + Report an Issue (GitHub) Fehler melden (GitHub) - + Ask a Question (GitHub) Frage stellen (GitHub) - + The novelWriter Website novelWriter-Website @@ -2096,22 +2211,22 @@ GuiMainStatus - + None Keine - + Editor Editor - + Project Projekt - + Session Time Session-Timer @@ -2134,63 +2249,63 @@ GuiManuscript - + Build Manuscript Manuskript erstellen - + Add New Build Neuen Build hinzufügen - + Delete Selected Build Ausgewählten Build löschen - + Edit Selected Build Ausgewählten Build bearbeiten - + Builds Builds - + Details Details - + Outline Gliederung - + Preview Vorschau - + Print Drucken - + Build Erstellen - + Close Schließen - - + + My Manuscript Mein Manuskript @@ -2256,18 +2371,18 @@ GuiNovelDetails - - + + Novel Details Romandetails - + Overview Übersicht - + Contents Inhalt @@ -2275,58 +2390,58 @@ GuiNovelToolBar - + Outline of {0} Gliederung für {0} - + Novel Root Hauptordner für den Roman - + Refresh Aktualisieren - + Last Column Letzte Spalte - + Hidden Ausblenden - + Point of View Character Erzählperspektive - + Focus Character Figur im Mittelpunkt - + Novel Plot Romanhandlung - - + + Column Size Spaltenbreite - + More Options Weitere Optionen - + Maximum column size in % Maximale Spaltenbreite in % @@ -2334,7 +2449,7 @@ GuiNovelTree - + No meta data Keine Meta-Daten @@ -2342,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title Titel - + Chapter Kapitel - + Scene Szene - + Section Abschnitt - + Document Dokument - + Status Status - + Characters Zeichen - + Words Wörter - + Paragraphs Absätze - + Synopsis Zusammenfassung - + Title Details Titeldetails - + Reference Tags Referenzen @@ -2407,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns Spalten anzeigen @@ -2415,17 +2530,17 @@ GuiOutlineToolBar - + Outline of Gliederung für - + Refresh Aktualisieren - + Export CSV CSV exportieren @@ -2433,7 +2548,7 @@ GuiOutlineTree - + Save Outline As Gliederung speichern @@ -2441,553 +2556,589 @@ GuiPreferences - - + + Preferences Einstellungen - + Search Suchen - + General Allgemein - + Appearance Darstellung - + Display language Anzeigesprache - - - + + Requires restart to take effect. Neustart erforderlich. - + Colour theme Farbschema (Anwendung) - + General colour theme and icons. Allgemeines Farbschema und Icons. - - Application font family - Schriftart (Anwendung) + + Application font + - - Application font size - Schriftgröße (Anwendung) - - - - - pt - pt - - - + Hide vertical scroll bars in main windows Vertikale Scrollbalken verbergen - - + + Scrolling available with mouse wheel and keys only. Beschränkt das Scrollen auf Mausrad und Tastatur. - + Hide horizontal scroll bars in main windows Horizontale Scrollbalken verbergen + + + Use the system's font selection dialog + + + Turn off to use the Qt font dialog, which may have more options. + + + + Document Style Darstellung von Dokumenten - + Document colour theme Farbschema (Dokumente) - + Colour theme for the editor and viewer. Farbschema für Editor und Ansicht. - - Document font family - Schriftart (Dokumente) + + Document font + - - - - + + + Applies to both document editor and viewer. Gilt für Editor und Ansicht. - - Document font size - Schriftgröße (Dokumente) - - - + Emphasise partition and chapter labels Dokumente mit höherer Hierarchie optisch hervorheben - + Makes them stand out in the project tree. Bessere Sichtbarkeit in der Strukturansicht. - + Show full path in document header Vollständige Dokumentenhierarchie im Editor anzeigen - + Add the parent folder names to the header. Zeigt die übergeordneten Elemente an. - + Include project notes in status bar word count Statusleiste: Wörter in Notizen mitzählen - + Auto Save Automatisch speichern - + Save document interval Dokument automatisch speichern - + How often the document is automatically saved. Wie oft das geöffnete Dokument automatisch gespeichert wird. - - + + seconds Sekunden - + Save project interval Projekt automatisch speichern - + How often the project is automatically saved. Wie oft das gesamte Projekt automatisch gespeichert wird. - + Project Backup Backups - + Browse Auswählen - + Backup storage location Verzeichnis für Backups - - + + Path: {0} Pfad: {0} - + Run backup when the project is closed Backup erstellen, wenn ein Projekt geschlossen wird - + Can be overridden for individual projects in Project Settings. Kann auch für einzelne Projekte in den Projekteinstellungen festgelegt werden. - + Ask before running backup Jedes Mal nachfragen, bevor ein Backup erstellt wird - + If off, backups will run in the background. Falls nein: Backups werden automatisch im Hintergrund erstellt. - + Session Timer Session-Timer - + Pause the session timer when not writing Den Timer bei Inaktivität pausieren - + Also pauses when the application window does not have focus. Pausiert auch, wenn das Programmfenster nicht den Fokus hat. - + Editor inactive time before pausing timer Pausiert nach Inaktivität - + User activity includes typing and changing the content. Dies berücksichtigt nur Änderungen im Texteditor. - + minutes Minuten - + Writing Schreiben - + Text Flow Textfluss - + Maximum text width in "Normal Mode" Maximale Textbreite im normalen Modus - + Set to 0 to disable this feature. „0“ deaktiviert diese Funktion. - - - - + + + + px px - + Maximum text width in "Focus Mode" Maximale Textbreite im Modus „Ablenkungsfrei“ - + The maximum width cannot be disabled. Die maximale Breite kann nicht deaktiviert werden. - + Hide document footer in "Focus Mode" Fußzeile verbergen im Modus „Ablenkungsfrei“ - + Hide the information bar in the document editor. Verbirgt die Informationsleiste im Editor. - + Justify the text margins Blocksatz - + Minimum text margin Mindestabstand nach außen - + Tab width Tabulator - + The width of a tab key press in the editor and viewer. Die Breite eines Tabulators im Editor und in der Ansicht. - + Text Editing Textbearbeitung - + Spell check language Rechtschreibprüfung - + Available languages are determined by your system. Verfügbare Sprachen werden vom Betriebssystem bereitgestellt. - + Auto-select word under cursor Wort mit Eingabezeiger gilt als „markiert“ - + Apply formatting to word under cursor if no selection is made. Wenn nichts markiert ist, werden Formatierung auf das Wort mit der Eingabemarke angewendet. - + Show tabs and spaces Tabs und Leerzeilen anzeigen - + Show line endings Zeilenende anzeigen - + Editor Scrolling Bildlauf im Editor - + Scroll past end of the document Am Ende des Dokuments weiterscrollen - + Also centres the cursor when scrolling. Eingabemarke wird beim Scrollen zentriert. - + Typewriter style scrolling when you type Wie mit einer Schreibmaschine scrollen - + Keeps the cursor at a fixed vertical position. Die Eingabemarke bleibt immer auf der gleichen Linie. - + Minimum position for Typewriter scrolling Mindesthöhe für den Schreibmaschinen-Effekt - + Percentage of the editor height from the top. Prozent der Editor-Höhe, von oben. - + Text Highlighting Hervorhebung - - Highlight text wrapped in quotes - Text in Anführungszeichen hervorheben + + None + Keine - - - - Applies to the document editor only. - Gilt nur für den Editor. + + Single Quotes + + + + + Double Quotes + + + + + Both + + + + + Highlight dialogue + + + + + Applies to the selected quote styles. + + + + + Allow open-ended dialogue + - Allow open-ended single quotes - Erlaube einfache Anführungszeichen ohne Schließung + Highlight dialogue line with no closing quote. + - - Highlight single-quoted line with no closing quote. - Hebt Text in einfachen Anführungszeichen hervor, auch wenn kein schließendes Anführungszeichen gefunden wird. + + Dialogue narrator break symbol + - - Allow open-ended double quotes - Erlaube doppelte Anführungszeichen ohne Schließung + + Symbol to indicate injected narrator break. + - - Highlight double-quoted line with no closing quote. - Hebt Text in doppelten Anführungszeichen hervor, auch wenn kein schließendes Anführungszeichen gefunden wird. + + Dialogue line symbol + - + + Lines starting with this symbol are dialogue. + + + + + Alternative dialogue symbols + + + + + Custom highlighting of dialogue text. + + + + Add highlight colour to emphasised text Formatierten Text hervorheben - + + + Applies to the document editor only. + Gilt nur für den Editor. + + + Highlight multiple or trailing spaces Mehrere oder nachfolgende Leerzeichen hervorheben - + Text Automation Automatisierung - + Auto-replace text as you type Text automatisch ersetzen - + Allow the editor to replace symbols as you type. Ermöglicht das Ersetzen von Symbolen während der Eingabe. - + Auto-replace single quotes Einfache Anführungszeichen ersetzen - - + + Try to guess which is an opening or a closing quote. Öffnende und schließende Anführungszeichen werden automatisch erkannt. - + Auto-replace double quotes Doppelte Anführungszeichen ersetzen - + Auto-replace dashes Bindestriche ersetzen - + Double and triple hyphens become short and long dashes. Doppelte und dreifache Bindestriche werden zu Gedankenstrichen und Geviertstrichen umgewandelt. - + Auto-replace dots Punkte ersetzen - + Three consecutive dots become ellipsis. Drei aufeinander folgende Punkte werden zu Auslassungspunkten umgewandelt. - + Insert non-breaking space before Geschütztes Leerzeichen einfügen vor - + Automatically add space before any of these symbols. Vor diesen Zeichen wird automatisch ein Leerzeichen eingefügt. - + Insert non-breaking space after Geschütztes Leerzeichen einfügen nach - + Automatically add space after any of these symbols. Nach diesen Zeichen wird automatisch ein Leerzeichen eingefügt. - + Use thin space instead Schmales Leerzeichen verwenden - + Inserts a thin space instead of a regular space. Schmales Leerzeichen anstelle eines normalen Leerzeichens verwenden. - + Quotation Style Anführungszeichen - + Single quote open style Einfaches Anführungszeichen öffnend - + The symbol to use for a leading single quote. Beginn von wörtlicher Rede mit einfachen Anführungszeichen. - + Single quote close style Einfaches Anführungszeichen schließend - + The symbol to use for a trailing single quote. Ende von wörtlicher Rede mit einfachen Anführungszeichen. - + Double quote open style Doppeltes Anführungszeichen öffnend - + The symbol to use for a leading double quote. Beginn von wörtlicher Rede mit doppelten Anführungszeichen. - + Double quote close style Doppeltes Anführungszeichen schließend - + The symbol to use for a trailing double quote. Ende von wörtlicher Rede mit doppelten Anführungszeichen. - + Backup Directory Backup-Verzeichnis @@ -3023,28 +3174,28 @@ GuiProjectSettings - - + + Project Settings Projekteinstellungen - + Settings Einstellungen - + Status Status - + Importance Wichtigkeit - + Auto-Replace Ersetzen @@ -3052,47 +3203,47 @@ GuiProjectToolBar - + Project Content Projektinhalt - + Quick Links Schnellzugriff - + Move Up Nach oben - + Move Down Nach unten - + Add Item Element hinzufügen - + Expand All Alle ausklappen - + Collapse All Alle einklappen - + Empty Trash Papierkorb leeren - + More Options Weitere Optionen @@ -3100,122 +3251,130 @@ GuiProjectTree - + Active Aktiv - + Inactive Inaktiv - + Permanently delete {0} file(s) from Trash? {0} Element(e) endgültig löschen? - + Did not find anywhere to add the file or folder! Konnte das Dokument oder den Ordner nirgends hinzufügen! - + Cannot add new files or folders to the Trash folder. Im Papierkorb kann kein neuer Ordner erstellt werden. - + New Note Neue Notiz - + New Chapter Neues Kapitel - + New Scene Neue Szene - + New Document Neues Dokument - + New Folder Neuer Ordner - + There is currently no Trash folder in this project. Derzeit gibt es keinen Papierkorb für dieses Projekt. - + The Trash folder is already empty. Papierkorb ist bereits leer. - + Move '{0}' to Trash? „{0}“ in den Papierkorb verschieben? - + Root folders can only be deleted when they are empty. Hauptordner können nur gelöscht werden, wenn sie leer sind. - + Permanently delete '{0}'? „{0}“ endgültig löschen? - + Drag and drop is only allowed for single items, non-root items, or multiple items with the same parent. Ziehen und Ablegen ist nur erlaubt für einzelne Elemente, Nicht-Hauptelemente oder mehrere Elemente mit dem gleichen übergeordneten Element. - + No documents selected for merging. Keine Dokumente zum Zusammenführen ausgewählt. - + Merged Zusammengeführt - - + + Could not write document content. Inhalt des Dokuments konnte nicht geschrieben werden. - + Do you want to duplicate this document? Soll dieses Dokument dupliziert werden? - + Do you want to duplicate this item and all child items? Soll dieses Element und alle untergeordneten Elemente dupliziert werden? - + Could not duplicate all items. Nicht alle Elemente konnten dupliziert werden. - + There is nowhere to add item with name '{0}'. Konnte das Element mit dem Namen „{0}“ nirgends hinzufügen. + + GuiQuoteSelect + + + Select Quote Style + + + GuiSideBar @@ -3300,33 +3459,33 @@ GuiWordList - - + + Project Word List Projektwörterbuch - + Import words from text file Wörter aus Textdatei importieren - + Export words to text file Wörter als Textdatei exportieren - + Note: The import file must be a plain text file with UTF-8 or ASCII encoding. Hinweis: Die Importdatei muss eine reine Textdatei mit UTF-8 oder ASCII-Kodierung sein. - + Import File Datei importieren - + Export File Datei exportieren @@ -3334,147 +3493,147 @@ GuiWritingStats - + Writing Statistics Statistiken - + Session Start Beginn - + Length Dauer - + Idle Inaktiv - + Words Wörter - + Histogram Histogramm - + Sum Totals Gesamt - + Total Time: Dauer: - + Idle Time: Inaktiv: - + Filtered Time: Dauer mit Filtern: - + Novel Word Count: Wörter im Roman: - + Notes Word Count: Wörter in den Notizen: - + Total Word Count: Wörter gesamt: - + Filters Filter - + Count novel files Romandokumente mitzählen - + Count note files Notizen mitzählen - + Hide zero word count Unproduktive Sessions verbergen - + Hide negative word count Negative Sessions verbergen - + Group entries by day Nach Tag gruppieren - + Show idle time Inaktivität anzeigen - + Word count cap for the histogram Maximale Wörterzahl für das Histogramm - + Save As Speichern als - + JSON Data File (.json) JSON-Datei (.json) - + CSV Data File (.csv) CSV-Datei (.csv) - + JSON Data File JSON-Datei - + CSV Data File CSV-Datei - + Save Data As Speichern als - + {0} file successfully written to: {0} erfolgreich gespeichert unter: - + Failed to write {0} file. Fehler beim Speichern der {0}. @@ -3482,153 +3641,153 @@ NWProject - + Could not delete document file. Datei konnte nicht gelöscht werden. - + Not a known project file format. Kein bekanntes Format für Projektdateien. - + Project file not found. Projektdatei nicht gefunden. - + Failed to open project. Projekt konnte nicht geöffnet werden. - + Unknown Unbekannt - + Project file does not appear to be a novelWriterXML file. Projektdatei scheint keine gültiges novelWriterXML zu sein. - + 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}. Unbekanntes oder nicht unterstütztes novelWriter-Projektformat. Das Projekt kann von dieser novelWriter-Version nicht geöffnet werden. Die Datei wurde gespeichert in Version {0}. - + Failed to parse project xml. XML-Datei des Projektes konnte nicht gelesen werden. - + 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? Das Dateiformat Ihres Projekts soll aktualisiert werden. Wenn Sie fortfahren, werden ältere Versionen von novelWriter dieses Projekt nicht mehr öffnen können. Fortfahren? - + 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? Dieses Projekt wurde in einer aktuelleren novelWriter-Version gespeichert ({0}). Die installierte Version ist {1}. Falls Sie das Projekt dennoch öffnen möchten, könnten einige Eigenschaften und Einstellungen möglicherweise nicht beibehalten werden. Abgesehen davon sollte das Projekt jedoch in Ordnung sein. Projekt öffnen? - + Recovered Wiederhergestellt - + Found {0} orphaned file(s) in the project. {1} file(s) were recovered. {0} verwaiste Datei(en) im Projekt gefunden. {1} Datei(en) wurden wiederhergestellt. - + Opened Project: {0} Projekt geöffnet: {0} - + There is no project open. Es ist kein Projekt offen. - + Failed to save project. Projekt konnte nicht gespeichert werden. - + Saved Project: {0} Projekt gespeichert: {0} - + Backing up project ... Backup wird erstellt ... - + Cannot backup project because no project name is set. Please set a Project Name in Project Settings. Ein Backup konnte nicht erstellt werden, da kein Projektname angegeben ist. Bitte legen Sie einen Projektnamen in den Projekteinstellungen fest. - + Could not create backup folder. Backup-Verzeichnis konnte nicht erstellt werden. - + Created a backup of your project of size {0}B. Ein Backup des Projekts mit der Größe {0}B wurde erstellt. - + Path: {0} Pfad: {0} - + Could not write backup archive. Backup-Archiv konnte nicht erstellt werden. - + Project backed up to '{0}' Backup erstellt: {0} - - + + New Neu - + Note Notiz - + Draft Entwurf - + Finished Fertig - + Minor Unwesentlich - + Major Wichtig - + Main Zentral @@ -3644,89 +3803,89 @@ ProjectBuilder - + The target folder is not empty. Please choose another folder. Das Zielverzeichnis ist nicht leer. Bitte wählen Sie ein anderes Verzeichnis. - + An error occurred while trying to create the project. Beim Erstellen des Projekts ist ein Fehler aufgetreten. - + New Project Neues Projekt - + Title Page Titelseite - + By Von - + Summary of the chapter. Zusammenfassung des Kapitels. - + Summary of the scene. Zusammenfassung der Szene. - + A short description. Eine kurze Beschreibung. - + Chapter {0} Kapitel {0} - - + + Scene {0} Szene {0} - + Main Plot Haupthandlung - + Protagonist Hauptfigur - + Main Location Hauptschauplatz - - + + The target folder already exists. Please choose another folder. Das Zielverzeichnis existiert bereits. Bitte wählen Sie ein anderes Verzeichnis. - + Could not copy project files. Projektdateien konnten nicht kopiert werden. - + Failed to create a new example project. Beispielprojekt konnte nicht erstellt werden. - + Failed to create a new example project. Could not find the necessary files. They seem to be missing from this installation. Neues Beispielprojekt konnte nicht erstellt werden. Die dafür benötigten Daten konnten nicht gefunden werden. Anscheinend fehlen die Beispieldaten in Ihrer Installation. @@ -3863,20 +4022,25 @@ SharedData - + novelWriter Project File or Zip File novelWriter-Projektdatei oder Zip-Datei - + novelWriter Project File novelWriter-Projektdatei - + Open Project Projekt öffnen + + + Select Font + + VersionInfoWidget @@ -3924,57 +4088,57 @@ _ContentsPage - + Table of Contents Inhaltsverzeichnis - + Title Titel - + Words Wörter - + Pages Seiten - + Page Seite - + Progress Fortschritt - + Words per page Wörter pro Seite - + First page offset Offset erste Seite - + Chapters on odd pages Kapitel auf ungeraden Seiten - + Untitled Ohne Titel - + END ENDE @@ -3982,32 +4146,32 @@ _DetailsWidget - + Setting Einstellung - + Value Wert - + Name Name - + Selection Auswahl - + Title Titel - + Hidden Ausgeblendet @@ -4015,37 +4179,37 @@ _FilterTab - + Included in manuscript Im Manuskript enthalten - + Excluded from manuscript Vom Manuskript ausgeschlossen - + Always included Immer enthalten - + Always excluded Immer ausgeschlossen - + Reset to default Auf Standard zurücksetzen - + Mark selection as Auswahl markieren als - + Select Root Folders Hauptordner wählen @@ -4053,22 +4217,22 @@ _GuiAlert - + Information Information - + Warning Warnung - + Error Fehler - + Question Frage @@ -4076,93 +4240,93 @@ _HeadingsTab - + Hide Ausblenden - - + + Editing: {0} Bearbeite: {0} - - + + None Keine - + Title Titel - + Chapter Number Kapitelnummer - + Chapter Number (Word) Kapitelnummer (Wort) - + Chapter Number (Upper Case Roman) Kapitelnummer (Römisch in Großbuchstaben) - + Chapter Number (Lower Case Roman) Kapitelnummer (Römisch in Kleinbuchstaben) - + Scene Number (In Chapter) Szenennummer (im Kapitel) - + Scene Number (Absolute) Szenennummer (Absolut) - + Point of View Character Erzählperspektive - + Focus Character Figur im Mittelpunkt - + Insert Einfügen - + Apply Anwenden - + Additional Styling Zusätzliche Formatierung - - - + + + Centre Zentriert - - - + + + Page Break Seitenumbruch @@ -4170,117 +4334,117 @@ _NewProjectForm - + Required Erforderlich - + Optional Optional - + Create a fresh project Neues Projekt erstellen - + Create an example project Beispielprojekt erstellen - + Copy an existing project Vorhandenes Projekt kopieren - + Project Name Projektname - + Author Autor - + Project Path Projektpfad - + Prefill Project Projekt vorbereiten - + Set to 0 to only add scenes Auf 0 setzen um nur Szenen hinzuzufügen - + Add {0} chapter documents {0} Kapiteldokumente hinzufügen - + Add {0} scene documents (to each chapter) {0} Szenendokumente hinzufügen (pro Kapitel) - + Add a folder for plot notes Ordner hinzufügen: Notizen für Handlungsstränge - + Add a folder for character notes Ordner hinzufügen: Notizen für Figuren - + Add a folder for location notes Ordner hinzufügen: Notizen für Schauplätze - + Add example notes to the above Beispielnotizen zur obigen Auswahl hinzufügen - + Chapters and Scenes Kapitel und Szenen - + Project Notes Projektnotizen - + Create New Project Neues Projekt erstellen - + Select Project Folder Speicherort wählen - + Fresh Project Neues Projekt - + Example Project Beispielprojekt - + Template: {0} Vorlage: {0} @@ -4288,7 +4452,7 @@ _NewProjectPage - + A project name is required. Ein Projektname ist erforderlich. @@ -4296,27 +4460,27 @@ _OpenProjectPage - + The project path is not reachable. Der Projektpfad ist nicht erreichbar. - + Path Pfad - + Remove '{0}' from the recent projects list? The project files will not be deleted. „{0}“ von der Liste der zuletzt geöffneten Projekte entfernen? Ihre Daten werden nicht gelöscht. - + Open Project Projekt öffnen - + Remove Project Projekt entfernen @@ -4324,54 +4488,54 @@ _OverviewPage - + Project Projekt - - + + Name Name - + Revisions Revisionen - + Editing Time Bearbeitungszeit - - + + Word Count Wörter - + In Novels in Romanen - + In Notes in Notizen - + Selected Novel Ausgewählter Roman - + Chapters Kapitel - + Scenes Szenen @@ -4379,40 +4543,40 @@ _PreviewWidget - + Press the "Preview" button to generate ... Zum Generieren den "Vorschau"-Button anklicken ... - + Processing ... In Bearbeitung ... - + Done Fertig - - Unknown - Unbekannt - - - + Built Erstellt + + + No Preview + + _ProjectListModel - + Word Count Wörter - + Last Opened Zuletzt geöffnet @@ -4420,77 +4584,77 @@ _ReplacePage - + Text Auto-Replace for Preview and Build Textersetzung für Vorschau und Build - + Keyword Stichwort - + Replace With Ersetzen durch - + Select item to edit Element zum Bearbeiten auswählen - - Save - Speichern + + Apply + Anwenden _SettingsPage - + Project name Projektname - + Changing this will affect the backup path. Änderungen wirken sich auf den Backup-Pfad aus. - + Author(s) Autor(en) - - + + Only used when building the manuscript. Wird nur beim Manuskript-Build verwendet. - + Project language Projektsprache - + Default Standard - + Spell check language Rechtschreibprüfung - - + + Overrides main preferences. Überschreibt die Einstellungen. - + Disable backup on close Kein Backup beim Schließen des Projekts @@ -4498,59 +4662,59 @@ _StatsWidget - - + + Words Wörter - - + + Characters Zeichen - + Words in Headings Wörter in Überschriften - + Words in Text Wörter im Text - + Headings Überschriften - + Paragraphs Absätze - + Characters in Headings Zeichen in Überschriften - + Characters in Text Zeichen im Text - + Characters, No Spaces Zeichen ohne Leerzeichen - + Characters in Headings, No Spaces Zeichen in Überschriften ohne Leerzeichen - + Characters in Text, No Spaces Zeichen im Text ohne Leerzeichen @@ -4558,196 +4722,216 @@ _StatusPage - + Novel Document Status Levels Romandokumente: Status - + Project Note Importance Levels Projektnotizen: Wichtigkeit - - Label - Name - - - - Usage - Vorkommen - - - - Select item to edit - Element zum Bearbeiten auswählen - - - - Colour - Farbe - - - - Save - Speichern - - - - Select Colour - Farbe wählen - - - - New Item - Neuer Eintrag - - - - Cannot delete a status item that is in use. - Element ist in Verwendung und konnte nicht gelöscht werden. - - - + Not in use Nicht verwendet - + Used once Einmal verwendet - + Used by {0} items Verwendet von {0} Elementen + + + Select Colour + Farbe wählen + + + + Label + Name + + + + Usage + Vorkommen + + + + Select item to edit + Element zum Bearbeiten auswählen + + + + Colour + Farbe + + + + Circles ... + + + + + Bars ... + + + + + Blocks ... + + + + + Shape + + + + + Apply + Anwenden + + + + New Item + Neuer Eintrag + + + + Cannot delete a status item that is in use. + Element ist in Verwendung und konnte nicht gelöscht werden. + _TreeContextMenu - + Empty Trash Papierkorb leeren - + Rename Umbenennen - + Open Document Dokument öffnen - + View Document Dokument anzeigen - + Create New ... Neu erstellen ... - + Rename to Heading Umbenennen: Überschrift übernehmen - + Set Active to ... Aktiv setzen auf ... - + Toggle Active Aktivieren ein/aus - + Set Status to ... Status setzen auf ... - - + + Manage Labels ... Beschriftungen verwalten ... - + Set Importance to ... Wichtigkeit setzen auf ... - + Transform ... Umwandeln ... - - - - + + + + Convert to {0} Umwandeln in {0} - + Merge Child Items into Self Unterelemente in dieses Dokument zusammenführen - + Merge Child Items into New Unterelemente in neues Dokument zusammenführen - + Merge Documents in Folder Dokumente im Ordner zusammenführen - + Split Document by Headings Dokument nach Überschriften aufteilen - + Expand All Alle aufklappen - + Collapse All Alle zuklappen - + Duplicate Duplizieren - - + + Delete Permanently Endgültig löschen - - + + Move to Trash In den Papierkorb legen - + Move {0} items to Trash? {0} Element(e) in den Papierkorb legen? - + Do you want to convert the folder to a {0}? This action cannot be reversed. Möchten Sie den Ordner umwandeln in {0}? Diese Aktion kann nicht rückgängig gemacht werden. @@ -4755,7 +4939,7 @@ _UpdatableMenu - + From Template Von Vorlage @@ -4763,12 +4947,12 @@ _ViewPanelBackRefs - + Document Dokument - + First Heading Erste Überschrift @@ -4776,27 +4960,27 @@ _ViewPanelKeyWords - + Tag Schlagwort - + Importance Wichtigkeit - + Document Dokument - + Heading Überschrift - + Short Description Kurzbeschreibung diff --git a/i18n/nw_en_US.ts b/i18n/nw_en_US.ts index e13e24cd..cd879a34 100644 --- a/i18n/nw_en_US.ts +++ b/i18n/nw_en_US.ts @@ -4,232 +4,242 @@ Builds - + Document Filters Document Filters - + Novel Documents Novel Documents - + Project Notes Project Notes - + Inactive Documents Inactive Documents - + Headings Headings - + Partition Format Partition Format - + Chapter Format Chapter Format - + Unnumbered Format Unnumbered Format - + Scene Format Scene Format - + Alt. Scene Format Alt. Scene Format - + Section Format Section Format - + Text Content Text Content - + Include Synopsis Include Synopsis - + Include Comments Include Comments - + Include Keywords Include Keywords - + Include Body Text Include Body Text - + Ignore These Keywords Ignore These Keywords - + Insert Content Insert Content - + Add Titles for Notes Add Titles for Notes - + Text Format Text Format - - - Font Family - Font Family - - - - Font Size - Font Size - + Text Font + + + + Line Height Line Height - + Text Options Text Options - + Justify Text Margins Justify Text Margins - + Replace Unicode Characters Replace Unicode Characters - + Replace Tabs with Spaces Replace Tabs with Spaces - - - Page Layout - Page Layout - - Unit - Unit - - - - Page Size - Page Size - - - - Page Width - Page Width - - - - Page Height - Page Height - - - - Top Margin - Top Margin - - - - Bottom Margin - Bottom Margin - - - - Left Margin - Left Margin - - - - Right Margin - Right Margin - - - - Open Document (.odt) - Open Document (.odt) - - - - Add Highlight Colours - Add Highlight Colors - - - - Page Header - Page Header - - - - Page Counter Offset - Page Counter Offset - - - - First Line Indent - First Line Indent - - - - Markdown (.md) - Markdown (.md) - - - Preserve Hard Line Breaks Preserve Hard Line Breaks + + + Apply Dialogue Highlighting + + + + + First Line Indent + First Line Indent + + + + Enable Indent + + + + + Indent Width + + + + + Indent First Paragraph + + + + + Page Layout + Page Layout + + + + Unit + Unit + + + + Page Size + Page Size + + + + Page Width + Page Width + + + + Page Height + Page Height + + + + Top Margin + Top Margin + + + + Bottom Margin + Bottom Margin + + + + Left Margin + Left Margin + + + + Right Margin + Right Margin + + Open Document (.odt) + Open Document (.odt) + + + + Add Highlight Colours + Add Highlight Colors + + + + Page Header + Page Header + + + + Page Counter Offset + Page Counter Offset + + + HTML (.html) HTML (.html) - + Add CSS Styles Add CSS Styles - + Preserve Tab Characters Preserve Tab Characters @@ -237,72 +247,72 @@ Common - + in the future in the future - + just now just now - + a minute ago a minute ago - + {0} minutes ago {0} minutes ago - + an hour ago an hour ago - + {0} hours ago {0} hours ago - + a day ago a day ago - + {0} days ago {0} days ago - + a week ago a week ago - + {0} weeks ago {0} weeks ago - + a month ago a month ago - + {0} months ago {0} months ago - + a year ago a year ago - + {0} years ago {0} years ago @@ -310,375 +320,475 @@ Constant - - - + + + None None - + Novel Novel - - + + Plot Plot - - + + Characters Characters - - + + Locations Locations - - + + Timeline Timeline - - + + Objects Objects - - + + Entities Entities - - - + + + Custom Custom - + Archive Archive - + Templates Templates - + Trash Trash - - + + Novel Document Novel Document - - + + Project Note Project Note - + Root Folder Root Folder - + Folder Folder - + Novel Title Page Novel Title Page - + Novel Chapter Novel Chapter - + Novel Scene Novel Scene - + Novel Section Novel Section - + Tag Tag - + Point of View Point of View - - + + Focus Focus - + Title Title - + Level Level - + Document Document - + Line Line - + Chars Chars - + Words Words - + Pars Pars - + POV POV - + Synopsis Synopsis - + Open Document (.odt) Open Document (.odt) - + Flat Open Document (.fodt) Flat Open Document (.fodt) - + novelWriter HTML (.html) novelWriter HTML (.html) - + novelWriter Markup (.txt) novelWriter Markup (.txt) - + Standard Markdown (.md) Standard Markdown (.md) - + Extended Markdown (.md) Extended Markdown (.md) - + JSON + novelWriter HTML (.json) JSON + novelWriter HTML (.json) - + JSON + novelWriter Markup (.json) JSON + novelWriter Markup (.json) + + + Square + + + + + Triangle + + + + + Nabla + + + + + Diamond + + + + + Pentagon + + + + + Hexagon + + + Star + + + + + Pacman + + + + + 1/4 Circle + + + + + Half Circle + + + + + 3/4 Circle + + + + + Full Circle + + + + + 1 Bar + + + + + 2 Bars + + + + + 3 Bars + + + + + 4 Bars + + + + + 1 Block + + + + + 2 Blocks + + + + + 3 Blocks + + + + + 4 Blocks + + + + Text files Text files - + Markdown files Markdown files - + novelWriter files novelWriter files - + CSV files CSV files - + All files All files - + Millimetres Millimeters - + Centimetres Centimeters - + Inches Inches - + A4 A4 - + A5 A5 - + A6 A6 - + US Legal US Legal - + US Letter US Letter - + Straight single quotation mark Straight single quotation mark - + Straight double quotation mark Straight double quotation mark - + Left single quotation mark Left single quotation mark - + Right single quotation mark Right single quotation mark - + Single low-9 quotation mark Single low-9 quotation mark - + Single high-reversed-9 quotation mark Single high-reversed-9 quotation mark - + Left double quotation mark Left double quotation mark - + Right double quotation mark Right double quotation mark - + Double low-9 quotation mark Double low-9 quotation mark - + Double high-reversed-9 quotation mark Double high-reversed-9 quotation mark - + Double low-reversed-9 quotation mark Double low-reversed-9 quotation mark - + Single left-pointing angle quotation mark Single left-pointing angle quotation mark - + Single right-pointing angle quotation mark Single right-pointing angle quotation mark - + Double left-pointing angle quotation mark Double left-pointing angle quotation mark - + Double right-pointing angle quotation mark Double right-pointing angle quotation mark - + Left corner bracket Left corner bracket - + Right corner bracket Right corner bracket - + Left white corner bracket Left white corner bracket - + Right white corner bracket Right white corner bracket @@ -704,38 +814,38 @@ GuiBuildSettings - - + + Manuscript Build Settings Manuscript Build Settings - + Name Name - + Selection Selection - + Headings Headings - + Content Content - + Format Format - + Output Output @@ -783,7 +893,7 @@ Could not process dictionary file - + Added: {0} [{1}B] Added: {0} [{1}B] @@ -791,22 +901,22 @@ GuiDocEditFooter - + Line: {0} ({1}) Line: {0} ({1}) - + Words: {0} ({1}) Words: {0} ({1}) - + Words: {0} selected Words: {0} selected - + Status Status @@ -814,27 +924,27 @@ GuiDocEditHeader - + Toggle Tool Bar Toggle Tool Bar - + Outline Outline - + Search Search - + Toggle Focus Mode Toggle Focus Mode - + Close Close @@ -842,62 +952,62 @@ GuiDocEditSearch - + Search for Search for - + Replace with Replace with - + Search Search - + Case Sensitive Case Sensitive - + Whole Words Only Whole Words Only - + RegEx Mode RegEx Mode - + Loop Search Loop Search - + Search Next File Search Next File - + Preserve Case Preserve Case - + Close Search Close Search - + Find in current document Find in current document - + Find and replace in current document Find and replace in current document @@ -905,122 +1015,122 @@ GuiDocEditor - + Opened Document: {0} Opened Document: {0} - + This document has been changed outside of novelWriter while it was open. Overwrite the file on disk? This document has been changed outside of novelWriter while it was open. Overwrite the file on disk? - + Could not save document. Could not save document. - + Saved Document: {0} Saved Document: {0} - + Spell checking requires the package PyEnchant. It does not appear to be installed. Spell checking requires the package PyEnchant. It does not appear to be installed. - + Spell check complete Spell check complete - + Document Details Document Details - + Created: {0} Created: {0} - + Updated: {0} Updated: {0} - + File Location: {0} File Location: {0} - + Set as Document Name Set as Document Name - + Follow Tag Follow Tag - + Create Note for Tag Create Note for Tag - + Cut Cut - + Copy Copy - + Paste Paste - + Select All Select All - + Select Word Select Word - + Select Paragraph Select Paragraph - + Spelling Suggestion(s) Spelling Suggestion(s) - + No Suggestions No Suggestions - + Add Word to Dictionary Add Word to Dictionary - + Please select some text before calling replace quotes. Please select some text before calling replace quotes. - + Do you want to create a new project note for the tag '{0}'? Do you want to create a new project note for the tag '{0}'? @@ -1104,52 +1214,52 @@ GuiDocToolBar - + Markdown Bold Markdown Bold - + Markdown Italic Markdown Italic - + Markdown Strikethrough Markdown Strikethrough - + Shortcode Bold Shortcode Bold - + Shortcode Italic Shortcode Italic - + Shortcode Strikethrough Shortcode Strikethrough - + Shortcode Underline Shortcode Underline - + Shortcode Highlight Shortcode Highlight - + Shortcode Superscript Shortcode Superscript - + Shortcode Subscript Shortcode Subscript @@ -1157,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel Show/Hide Viewer Panel - + Comments Comments - + Show Comments Show Comments - + Synopsis Synopsis - + Show Synopsis Comments Show Synopsis Comments @@ -1185,27 +1295,27 @@ GuiDocViewHeader - + Outline Outline - + Go Backward Go Backward - + Go Forward Go Forward - + Reload Reload - + Close Close @@ -1213,27 +1323,27 @@ GuiDocViewer - + An error occurred while generating the preview. An error occurred while generating the preview. - + Copy Copy - + Select All Select All - + Select Word Select Word - + Select Paragraph Select Paragraph @@ -1254,12 +1364,12 @@ GuiEditLabel - + Item Label Item Label - + Label Label @@ -1267,37 +1377,37 @@ GuiItemDetails - + Label Label - + Status Status - + Class Class - + Usage Usage - + Characters Characters - + Words Words - + Paragraphs Paragraphs @@ -1305,27 +1415,27 @@ GuiLipsum - + Insert Placeholder Text Insert Placeholder Text - + Insert Lorem Ipsum Text Insert Lorem Ipsum Text - + Number of paragraphs Number of paragraphs - + Randomise order Randomize order - + Insert Insert @@ -1333,78 +1443,78 @@ GuiMain - + novelWriter is ready ... novelWriter is ready ... - + You are now running novelWriter version {0}. You are now running novelWriter version {0}. - + Please check the {0}release notes{1} for further details. Please check the {0}release notes{1} for further details. - + Close the current project? Close the current project? - - + + Changes are saved automatically. Changes are saved automatically. - + Backup the current project? Backup the current project? - + The project is already open by another instance of novelWriter, and is therefore locked. Override lock and continue anyway? 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. 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 was locked by the computer '{0}' ({1} {2}), last active on {3}. The project was locked by the computer '{0}' ({1} {2}), last active on {3}. - + The project index is outdated or broken. Rebuilding index. The project index is outdated or broken. Rebuilding index. - + Import File Import File - + Could not read file. The file must be an existing text file. Could not read file. The file must be an existing text file. - + Please open a document to import the text file into. Please open a document to import the text file into. - + Importing the file will overwrite the current content of the document. Do you want to proceed? Importing the file will overwrite the current content of the document. Do you want to proceed? - + Indexing completed in {0} ms Indexing completed in {0} ms @@ -1414,22 +1524,22 @@ The project index has been successfully rebuilt. - + Could not initialise the dialog. Could not initialize the dialog. - + Do you want to exit novelWriter? Do you want to exit novelWriter? - + Some changes will not be applied until novelWriter has been restarted. Some changes will not be applied until novelWriter has been restarted. - + 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}. 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}. @@ -1573,13 +1683,13 @@ - Go to Project Tree - Go to Project Tree + Go to Tree View + - Go to Document Editor - Go to Document Editor + Go to Document + @@ -1797,297 +1907,302 @@ Placeholder Text - + + Footnote + + + + &Format &Format - + Bold Bold - + Italic Italic - + Strikethrough Strikethrough - + Wrap Double Quotes Wrap Double Quotes - + Wrap Single Quotes Wrap Single Quotes - + More Formats ... More Formats ... - + Bold (Shortcode) Bold (Shortcode) - + Italics (Shortcode) Italics (Shortcode) - + Strikethrough (Shortcode) Strikethrough (Shortcode) - + Underline Underline - + Highlight Highlight - + Superscript Superscript - + Subscript Subscript - + Heading 1 (Partition) Heading 1 (Partition) - + Heading 2 (Chapter) Heading 2 (Chapter) - + Heading 3 (Scene) Heading 3 (Scene) - + Heading 4 (Section) Heading 4 (Section) - + Novel Title Novel Title - + Unnumbered Chapter Unnumbered Chapter - + Alternative Scene Alternative Scene - + Align Left Align Left - + Align Centre Align Center - + Align Right Align Right - + Indent Left Indent Left - + Indent Right Indent Right - + Toggle Comment Toggle Comment - + Toggle Ignore Text Toggle Ignore Text - + Remove Block Format Remove Block Format - + Replace Straight Single Quotes Replace Straight Single Quotes - + Replace Straight Double Quotes Replace Straight Double Quotes - + Remove In-Paragraph Breaks Remove In-Paragraph Breaks - + &Search &Search - + Find Find - + Replace Replace - + Find Next Find Next - + Find Previous Find Previous - + Replace Next Replace Next - + Find in Project Find in Project - + &Tools &Tools - + Check Spelling Check Spelling - + Spell Check Language Spell Check Language - + Default Default - + Re-Run Spell Check Re-Run Spell Check - + Project Word List Project Word List - + Add Dictionaries Add Dictionaries - + Rebuild Index Rebuild Index - + Backup Project Backup Project - + Build Manuscript Build Manuscript - + Writing Statistics Writing Statistics - + Preferences Preferences - + &Help &Help - + About novelWriter About novelWriter - + About Qt5 About Qt5 - + User Manual (Online) User Manual (Online) - + User Manual (PDF) User Manual (PDF) - + Report an Issue (GitHub) Report an Issue (GitHub) - + Ask a Question (GitHub) Ask a Question (GitHub) - + The novelWriter Website The novelWriter Website @@ -2096,22 +2211,22 @@ GuiMainStatus - + None None - + Editor Editor - + Project Project - + Session Time Session Time @@ -2134,63 +2249,63 @@ GuiManuscript - + Build Manuscript Build Manuscript - + Add New Build Add New Build - + Delete Selected Build Delete Selected Build - + Edit Selected Build Edit Selected Build - + Builds Builds - + Details Details - + Outline Outline - + Preview Preview - + Print Print - + Build Build - + Close Close - - + + My Manuscript My Manuscript @@ -2256,18 +2371,18 @@ GuiNovelDetails - - + + Novel Details Novel Details - + Overview Overview - + Contents Contents @@ -2275,58 +2390,58 @@ GuiNovelToolBar - + Outline of {0} Outline of {0} - + Novel Root Novel Root - + Refresh Refresh - + Last Column Last Column - + Hidden Hidden - + Point of View Character Point of View Character - + Focus Character Focus Character - + Novel Plot Novel Plot - - + + Column Size Column Size - + More Options More Options - + Maximum column size in % Maximum column size in % @@ -2334,7 +2449,7 @@ GuiNovelTree - + No meta data No meta data @@ -2342,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title Title - + Chapter Chapter - + Scene Scene - + Section Section - + Document Document - + Status Status - + Characters Characters - + Words Words - + Paragraphs Paragraphs - + Synopsis Synopsis - + Title Details Title Details - + Reference Tags Reference Tags @@ -2407,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns Select Columns @@ -2415,17 +2530,17 @@ GuiOutlineToolBar - + Outline of Outline of - + Refresh Refresh - + Export CSV Export CSV @@ -2433,7 +2548,7 @@ GuiOutlineTree - + Save Outline As Save Outline As @@ -2441,553 +2556,589 @@ GuiPreferences - - + + Preferences Preferences - + Search Search - + General General - + Appearance Appearance - + Display language Display language - - - + + Requires restart to take effect. Requires restart to take effect. - + Colour theme Color theme - + General colour theme and icons. General color theme and icons. - - Application font family - Application font family + + Application font + - - Application font size - Application font size - - - - - pt - pt - - - + Hide vertical scroll bars in main windows Hide vertical scroll bars in main windows - - + + Scrolling available with mouse wheel and keys only. Scrolling available with mouse wheel and keys only. - + Hide horizontal scroll bars in main windows Hide horizontal scroll bars in main windows + + + Use the system's font selection dialog + + + Turn off to use the Qt font dialog, which may have more options. + + + + Document Style Document Style - + Document colour theme Document color theme - + Colour theme for the editor and viewer. Color theme for the editor and viewer. - - Document font family - Document font family + + Document font + - - - - + + + Applies to both document editor and viewer. Applies to both document editor and viewer. - - Document font size - Document font size - - - + Emphasise partition and chapter labels Emphasize partition and chapter labels - + Makes them stand out in the project tree. Makes them stand out in the project tree. - + Show full path in document header Show full path in document header - + Add the parent folder names to the header. Add the parent folder names to the header. - + Include project notes in status bar word count Include project notes in status bar word count - + Auto Save Auto Save - + Save document interval Save document interval - + How often the document is automatically saved. How often the document is automatically saved. - - + + seconds seconds - + Save project interval Save project interval - + How often the project is automatically saved. How often the project is automatically saved. - + Project Backup Project Backup - + Browse Browse - + Backup storage location Backup storage location - - + + Path: {0} Path: {0} - + Run backup when the project is closed Run backup when the project is closed - + Can be overridden for individual projects in Project Settings. Can be overridden for individual projects in Project Settings. - + Ask before running backup Ask before running backup - + If off, backups will run in the background. If off, backups will run in the background. - + Session Timer Session Timer - + Pause the session timer when not writing Pause the session timer when not writing - + Also pauses when the application window does not have focus. Also pauses when the application window does not have focus. - + Editor inactive time before pausing timer Editor inactive time before pausing timer - + User activity includes typing and changing the content. User activity includes typing and changing the content. - + minutes minutes - + Writing Writing - + Text Flow Text Flow - + Maximum text width in "Normal Mode" Maximum text width in "Normal Mode" - + Set to 0 to disable this feature. Set to 0 to disable this feature. - - - - + + + + px px - + Maximum text width in "Focus Mode" Maximum text width in "Focus Mode" - + The maximum width cannot be disabled. The maximum width cannot be disabled. - + Hide document footer in "Focus Mode" Hide document footer in "Focus Mode" - + Hide the information bar in the document editor. Hide the information bar in the document editor. - + Justify the text margins Justify the text margins - + Minimum text margin Minimum text margin - + Tab width Tab width - + The width of a tab key press in the editor and viewer. The width of a tab key press in the editor and viewer. - + Text Editing Text Editing - + Spell check language Spell check language - + Available languages are determined by your system. Available languages are determined by your system. - + Auto-select word under cursor Auto-select word under cursor - + Apply formatting to word under cursor if no selection is made. Apply formatting to word under cursor if no selection is made. - + Show tabs and spaces Show tabs and spaces - + Show line endings Show line endings - + Editor Scrolling Editor Scrolling - + Scroll past end of the document Scroll past end of the document - + Also centres the cursor when scrolling. Also centers the cursor when scrolling. - + Typewriter style scrolling when you type Typewriter style scrolling when you type - + Keeps the cursor at a fixed vertical position. Keeps the cursor at a fixed vertical position. - + Minimum position for Typewriter scrolling Minimum position for Typewriter scrolling - + Percentage of the editor height from the top. Percentage of the editor height from the top. - + Text Highlighting Text Highlighting - - Highlight text wrapped in quotes - Highlight text wrapped in quotes + + None + None - - - - Applies to the document editor only. - Applies to the document editor only. + + Single Quotes + + + + + Double Quotes + + + + + Both + + + + + Highlight dialogue + + + + + Applies to the selected quote styles. + + + + + Allow open-ended dialogue + - Allow open-ended single quotes - Allow open-ended single quotes + Highlight dialogue line with no closing quote. + - - Highlight single-quoted line with no closing quote. - Highlight single-quoted line with no closing quote. + + Dialogue narrator break symbol + - - Allow open-ended double quotes - Allow open-ended double quotes + + Symbol to indicate injected narrator break. + - - Highlight double-quoted line with no closing quote. - Highlight double-quoted line with no closing quote. + + Dialogue line symbol + - + + Lines starting with this symbol are dialogue. + + + + + Alternative dialogue symbols + + + + + Custom highlighting of dialogue text. + + + + Add highlight colour to emphasised text Add highlight color to emphasised text - + + + Applies to the document editor only. + Applies to the document editor only. + + + Highlight multiple or trailing spaces Highlight multiple or trailing spaces - + Text Automation Text Automation - + Auto-replace text as you type Auto-replace text as you type - + Allow the editor to replace symbols as you type. Allow the editor to replace symbols as you type. - + Auto-replace single quotes Auto-replace single quotes - - + + Try to guess which is an opening or a closing quote. Try to guess which is an opening or a closing quote. - + Auto-replace double quotes Auto-replace double quotes - + Auto-replace dashes Auto-replace dashes - + Double and triple hyphens become short and long dashes. Double and triple hyphens become short and long dashes. - + Auto-replace dots Auto-replace dots - + Three consecutive dots become ellipsis. Three consecutive dots become ellipsis. - + Insert non-breaking space before Insert non-breaking space before - + Automatically add space before any of these symbols. Automatically add space before any of these symbols. - + Insert non-breaking space after Insert non-breaking space after - + Automatically add space after any of these symbols. Automatically add space after any of these symbols. - + Use thin space instead Use thin space instead - + Inserts a thin space instead of a regular space. Inserts a thin space instead of a regular space. - + Quotation Style Quotation Style - + Single quote open style Single quote open style - + The symbol to use for a leading single quote. The symbol to use for a leading single quote. - + Single quote close style Single quote close style - + The symbol to use for a trailing single quote. The symbol to use for a trailing single quote. - + Double quote open style Double quote open style - + The symbol to use for a leading double quote. The symbol to use for a leading double quote. - + Double quote close style Double quote close style - + The symbol to use for a trailing double quote. The symbol to use for a trailing double quote. - + Backup Directory Backup Directory @@ -3023,28 +3174,28 @@ GuiProjectSettings - - + + Project Settings Project Settings - + Settings Settings - + Status Status - + Importance Importance - + Auto-Replace Auto-Replace @@ -3052,47 +3203,47 @@ GuiProjectToolBar - + Project Content Project Content - + Quick Links Quick Links - + Move Up Move Up - + Move Down Move Down - + Add Item Add Item - + Expand All Expand All - + Collapse All Collapse All - + Empty Trash Empty Trash - + More Options More Options @@ -3100,122 +3251,130 @@ GuiProjectTree - + Active Active - + Inactive Inactive - + Permanently delete {0} file(s) from Trash? Permanently delete {0} file(s) from Trash? - + Did not find anywhere to add the file or folder! Did not find anywhere to add the file or folder! - + Cannot add new files or folders to the Trash folder. Cannot add new files or folders to the Trash folder. - + New Note New Note - + New Chapter New Chapter - + New Scene New Scene - + New Document New Document - + New Folder New Folder - + There is currently no Trash folder in this project. There is currently no Trash folder in this project. - + The Trash folder is already empty. The Trash folder is already empty. - + Move '{0}' to Trash? Move '{0}' to Trash? - + Root folders can only be deleted when they are empty. Root folders can only be deleted when they are empty. - + Permanently delete '{0}'? Permanently delete '{0}'? - + Drag and drop is only allowed for single items, non-root items, or multiple items with the same parent. Drag and drop is only allowed for single items, non-root items, or multiple items with the same parent. - + No documents selected for merging. No documents selected for merging. - + Merged Merged - - + + Could not write document content. Could not write document content. - + Do you want to duplicate this document? Do you want to duplicate this document? - + Do you want to duplicate this item and all child items? Do you want to duplicate this item and all child items? - + Could not duplicate all items. Could not duplicate all items. - + There is nowhere to add item with name '{0}'. There is nowhere to add item with name '{0}'. + + GuiQuoteSelect + + + Select Quote Style + + + GuiSideBar @@ -3300,33 +3459,33 @@ GuiWordList - - + + Project Word List Project Word List - + Import words from text file Import words from text file - + Export words to text file Export words to text file - + Note: The import file must be a plain text file with UTF-8 or ASCII encoding. Note: The import file must be a plain text file with UTF-8 or ASCII encoding. - + Import File Import File - + Export File Export File @@ -3334,147 +3493,147 @@ GuiWritingStats - + Writing Statistics Writing Statistics - + Session Start Session Start - + Length Length - + Idle Idle - + Words Words - + Histogram Histogram - + Sum Totals Sum Totals - + Total Time: Total Time: - + Idle Time: Idle Time: - + Filtered Time: Filtered Time: - + Novel Word Count: Novel Word Count: - + Notes Word Count: Notes Word Count: - + Total Word Count: Total Word Count: - + Filters Filters - + Count novel files Count novel files - + Count note files Count note files - + Hide zero word count Hide zero word count - + Hide negative word count Hide negative word count - + Group entries by day Group entries by day - + Show idle time Show idle time - + Word count cap for the histogram Word count cap for the histogram - + Save As Save As - + JSON Data File (.json) JSON Data File (.json) - + CSV Data File (.csv) CSV Data File (.csv) - + JSON Data File JSON Data File - + CSV Data File CSV Data File - + Save Data As Save Data As - + {0} file successfully written to: {0} file successfully written to: - + Failed to write {0} file. Failed to write {0} file. @@ -3482,153 +3641,153 @@ NWProject - + Could not delete document file. Could not delete document file. - + Not a known project file format. Not a known project file format. - + Project file not found. Project file not found. - + Failed to open project. Failed to open project. - + Unknown Unknown - + Project file does not appear to be a novelWriterXML file. 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}. 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. Failed to parse project xml. - + 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? 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? - + 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? 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? - + Recovered Recovered - + Found {0} orphaned file(s) in the project. {1} file(s) were recovered. Found {0} orphaned file(s) in the project. {1} file(s) were recovered. - + Opened Project: {0} Opened Project: {0} - + There is no project open. There is no project open. - + Failed to save project. Failed to save project. - + Saved Project: {0} Saved Project: {0} - + Backing up project ... Backing up project ... - + Cannot backup project because no project name is set. Please set a Project Name in Project Settings. Cannot backup project because no project name is set. Please set a Project Name in Project Settings. - + Could not create backup folder. Could not create backup folder. - + Created a backup of your project of size {0}B. Created a backup of your project of size {0}B. - + Path: {0} Path: {0} - + Could not write backup archive. Could not write backup archive. - + Project backed up to '{0}' Project backed up to '{0}' - - + + New New - + Note Note - + Draft Draft - + Finished Finished - + Minor Minor - + Major Major - + Main Main @@ -3644,89 +3803,89 @@ ProjectBuilder - + The target folder is not empty. Please choose another folder. The target folder is not empty. Please choose another folder. - + An error occurred while trying to create the project. An error occurred while trying to create the project. - + New Project New Project - + Title Page Title Page - + By By - + Summary of the chapter. Summary of the chapter. - + Summary of the scene. Summary of the scene. - + A short description. A short description. - + Chapter {0} Chapter {0} - - + + Scene {0} Scene {0} - + Main Plot Main Plot - + Protagonist Protagonist - + Main Location Main Location - - + + The target folder already exists. Please choose another folder. The target folder already exists. Please choose another folder. - + Could not copy project files. Could not copy project files. - + Failed to create a new example project. Failed to create a new example project. - + Failed to create a new example project. Could not find the necessary files. They seem to be missing from this installation. Failed to create a new example project. Could not find the necessary files. They seem to be missing from this installation. @@ -3863,20 +4022,25 @@ SharedData - + novelWriter Project File or Zip File novelWriter Project File or Zip File - + novelWriter Project File novelWriter Project File - + Open Project Open Project + + + Select Font + + VersionInfoWidget @@ -3924,57 +4088,57 @@ _ContentsPage - + Table of Contents Table of Contents - + Title Title - + Words Words - + Pages Pages - + Page Page - + Progress Progress - + Words per page Words per page - + First page offset First page offset - + Chapters on odd pages Chapters on odd pages - + Untitled Untitled - + END END @@ -3982,32 +4146,32 @@ _DetailsWidget - + Setting Setting - + Value Value - + Name Name - + Selection Selection - + Title Title - + Hidden Hidden @@ -4015,37 +4179,37 @@ _FilterTab - + Included in manuscript Included in manuscript - + Excluded from manuscript Excluded from manuscript - + Always included Always included - + Always excluded Always excluded - + Reset to default Reset to default - + Mark selection as Mark selection as - + Select Root Folders Select Root Folders @@ -4053,22 +4217,22 @@ _GuiAlert - + Information Information - + Warning Warning - + Error Error - + Question Question @@ -4076,93 +4240,93 @@ _HeadingsTab - + Hide Hide - - + + Editing: {0} Editing: {0} - - + + None None - + Title Title - + Chapter Number Chapter Number - + Chapter Number (Word) Chapter Number (Word) - + Chapter Number (Upper Case Roman) Chapter Number (Upper Case Roman) - + Chapter Number (Lower Case Roman) Chapter Number (Lower Case Roman) - + Scene Number (In Chapter) Scene Number (In Chapter) - + Scene Number (Absolute) Scene Number (Absolute) - + Point of View Character Point of View Character - + Focus Character Focus Character - + Insert Insert - + Apply Apply - + Additional Styling Additional Styling - - - + + + Centre Center - - - + + + Page Break Page Break @@ -4170,117 +4334,117 @@ _NewProjectForm - + Required Required - + Optional Optional - + Create a fresh project Create a fresh project - + Create an example project Create an example project - + Copy an existing project Copy an existing project - + Project Name Project Name - + Author Author - + Project Path Project Path - + Prefill Project Prefill Project - + Set to 0 to only add scenes Set to 0 to only add scenes - + Add {0} chapter documents Add {0} chapter documents - + Add {0} scene documents (to each chapter) Add {0} scene documents (to each chapter) - + Add a folder for plot notes Add a folder for plot notes - + Add a folder for character notes Add a folder for character notes - + Add a folder for location notes Add a folder for location notes - + Add example notes to the above Add example notes to the above - + Chapters and Scenes Chapters and Scenes - + Project Notes Project Notes - + Create New Project Create New Project - + Select Project Folder Select Project Folder - + Fresh Project Fresh Project - + Example Project Example Project - + Template: {0} Template: {0} @@ -4288,7 +4452,7 @@ _NewProjectPage - + A project name is required. A project name is required. @@ -4296,27 +4460,27 @@ _OpenProjectPage - + The project path is not reachable. The project path is not reachable. - + Path Path - + Remove '{0}' from the recent projects list? The project files will not be deleted. Remove '{0}' from the recent projects list? The project files will not be deleted. - + Open Project Open Project - + Remove Project Remove Project @@ -4324,54 +4488,54 @@ _OverviewPage - + Project Project - - + + Name Name - + Revisions Revisions - + Editing Time Editing Time - - + + Word Count Word Count - + In Novels In Novels - + In Notes In Notes - + Selected Novel Selected Novel - + Chapters Chapters - + Scenes Scenes @@ -4379,40 +4543,40 @@ _PreviewWidget - + Press the "Preview" button to generate ... Press the "Preview" button to generate ... - + Processing ... Processing ... - + Done Done - - Unknown - Unknown - - - + Built Built + + + No Preview + + _ProjectListModel - + Word Count Word Count - + Last Opened Last Opened @@ -4420,77 +4584,77 @@ _ReplacePage - + Text Auto-Replace for Preview and Build Text Auto-Replace for Preview and Build - + Keyword Keyword - + Replace With Replace With - + Select item to edit Select item to edit - - Save - Save + + Apply + Apply _SettingsPage - + Project name Project name - + Changing this will affect the backup path. Changing this will affect the backup path. - + Author(s) Author(s) - - + + Only used when building the manuscript. Only used when building the manuscript. - + Project language Project language - + Default Default - + Spell check language Spell check language - - + + Overrides main preferences. Overrides main preferences. - + Disable backup on close Disable backup on close @@ -4498,59 +4662,59 @@ _StatsWidget - - + + Words Words - - + + Characters Characters - + Words in Headings Words in Headings - + Words in Text Words in Text - + Headings Headings - + Paragraphs Paragraphs - + Characters in Headings Characters in Headings - + Characters in Text Characters in Text - + Characters, No Spaces Characters, No Spaces - + Characters in Headings, No Spaces Characters in Headings, No Spaces - + Characters in Text, No Spaces Characters in Text, No Spaces @@ -4558,196 +4722,216 @@ _StatusPage - + Novel Document Status Levels Novel Document Status Levels - + Project Note Importance Levels Project Note Importance Levels - - Label - Label - - - - Usage - Usage - - - - Select item to edit - Select item to edit - - - - Colour - Color - - - - Save - Save - - - - Select Colour - Select Color - - - - New Item - New Item - - - - Cannot delete a status item that is in use. - Cannot delete a status item that is in use. - - - + Not in use Not in use - + Used once Used once - + Used by {0} items Used by {0} items + + + Select Colour + Select Color + + + + Label + Label + + + + Usage + Usage + + + + Select item to edit + Select item to edit + + + + Colour + Color + + + + Circles ... + + + + + Bars ... + + + + + Blocks ... + + + + + Shape + + + + + Apply + Apply + + + + New Item + New Item + + + + Cannot delete a status item that is in use. + Cannot delete a status item that is in use. + _TreeContextMenu - + Empty Trash Empty Trash - + Rename Rename - + Open Document Open Document - + View Document View Document - + Create New ... Create New ... - + Rename to Heading Rename to Heading - + Set Active to ... Set Active to ... - + Toggle Active Toggle Active - + Set Status to ... Set Status to ... - - + + Manage Labels ... Manage Labels ... - + Set Importance to ... Set Importance to ... - + Transform ... Transform ... - - - - + + + + Convert to {0} Convert to {0} - + Merge Child Items into Self Merge Child Items into Self - + Merge Child Items into New Merge Child Items into New - + Merge Documents in Folder Merge Documents in Folder - + Split Document by Headings Split Document by Headings - + Expand All Expand All - + Collapse All Collapse All - + Duplicate Duplicate - - + + Delete Permanently Delete Permanently - - + + Move to Trash Move to Trash - + Move {0} items to Trash? Move {0} items to Trash? - + Do you want to convert the folder to a {0}? This action cannot be reversed. Do you want to convert the folder to a {0}? This action cannot be reversed. @@ -4755,7 +4939,7 @@ _UpdatableMenu - + From Template From Template @@ -4763,12 +4947,12 @@ _ViewPanelBackRefs - + Document Document - + First Heading First Heading @@ -4776,27 +4960,27 @@ _ViewPanelKeyWords - + Tag Tag - + Importance Importance - + Document Document - + Heading Heading - + Short Description Short Description diff --git a/i18n/nw_es_419.ts b/i18n/nw_es_419.ts index c617aae7..a98e9ed5 100644 --- a/i18n/nw_es_419.ts +++ b/i18n/nw_es_419.ts @@ -4,232 +4,242 @@ Builds - + Document Filters Filtrado de Documentos - + Novel Documents Documentos de Novela - + Project Notes Notas del Proyecto - + Inactive Documents Documentos Excluidos - + Headings Títulación - + Partition Format Formato para Particiones - + Chapter Format Formato para Capítulos - + Unnumbered Format Formato Sin Numeración - + Scene Format Formato para Escenas - + Alt. Scene Format Formato Alternativo para Escenas - + Section Format Formato para Secciones - + Text Content Contenido Textual - + Include Synopsis Incluir las Sinopsis - + Include Comments Incluir los Comentarios - + Include Keywords Incluir las Palabras Clave - + Include Body Text Incluir el Texto Base - + Ignore These Keywords Ignorar estas palabras clave - + Insert Content Inserción de Contenido - + Add Titles for Notes Añadir Títulos a las Notas - + Text Format Formato del Texto - - - Font Family - Tipografía - - - - Font Size - Tamaño - + Text Font + + + + Line Height Altura de Línea - + Text Options Opciones de Texto - + Justify Text Margins Justificar los Márgenes del Texto - + Replace Unicode Characters Reemplazar Caracteres Unicode - + Replace Tabs with Spaces Reemplazar Tabulaciones por Espacios - - - Page Layout - Diseño de Página - - Unit - Unidades - - - - Page Size - Tamaño de Página - - - - Page Width - Ancho de Página - - - - Page Height - Altura de Página - - - - Top Margin - Margen Superior - - - - Bottom Margin - Margen Inferior - - - - Left Margin - Margen Izquierdo - - - - Right Margin - Margen Derecho - - - - Open Document (.odt) - Open Document (.odt) - - - - Add Highlight Colours - Añadir Resaltes en Colores - - - - Page Header - Encabezado de Página - - - - Page Counter Offset - Desfase del Número de Página - - - - First Line Indent - Sangría en Línea Inicial - - - - Markdown (.md) - Markdown (.md) - - - Preserve Hard Line Breaks Conservar Saltos de Línea Forzados + + + Apply Dialogue Highlighting + + + + + First Line Indent + Sangría en Línea Inicial + + + + Enable Indent + + + + + Indent Width + + + + + Indent First Paragraph + + + + + Page Layout + Diseño de Página + + + + Unit + Unidades + + + + Page Size + Tamaño de Página + + + + Page Width + Ancho de Página + + + + Page Height + Altura de Página + + + + Top Margin + Margen Superior + + + + Bottom Margin + Margen Inferior + + + + Left Margin + Margen Izquierdo + + + + Right Margin + Margen Derecho + + Open Document (.odt) + Open Document (.odt) + + + + Add Highlight Colours + Añadir Resaltes en Colores + + + + Page Header + Encabezado de Página + + + + Page Counter Offset + Desfase del Número de Página + + + HTML (.html) HTML (.html) - + Add CSS Styles Añadir Estilos CSS - + Preserve Tab Characters Preservar Caracteres de Tabulación @@ -237,72 +247,72 @@ Common - + in the future en el futuro - + just now ahora mismo - + a minute ago hace un minuto - + {0} minutes ago hace {0} minutos - + an hour ago hace una hora - + {0} hours ago hace {0} horas - + a day ago hace un día - + {0} days ago hace {0} días - + a week ago hace una semana - + {0} weeks ago hace {0} semanas - + a month ago hace un mes - + {0} months ago hace {0} meses - + a year ago hace un año - + {0} years ago hace {0} años @@ -310,375 +320,475 @@ Constant - - - + + + None Ninguno - + Novel Novela - - + + Plot Argumento - - + + Characters Personajes - - + + Locations Lugares - - + + Timeline Línea de Tiempo - - + + Objects Objetos - - + + Entities Entidades - - - + + + Custom Personalizado - + Archive Archivo - + Templates Plantillas - + Trash Papelera - - + + Novel Document Documento de Novela - - + + Project Note Nota del Proyecto - + Root Folder Carpeta Raíz - + Folder Carpeta - + Novel Title Page Portada de Novela - + Novel Chapter Capítulo de Novela - + Novel Scene Escena de Novela - + Novel Section Sección Novela - + Tag Etiqueta - + Point of View Punto de Vista - - + + Focus Foco - + Title Título - + Level Nivel - + Document Documento - + Line Línea - + Chars Caract. - + Words Palab. - + Pars Párrafo - + POV Perspectiva - + Synopsis Sinopsis - + Open Document (.odt) Open Document (.odt) - + Flat Open Document (.fodt) Flat Open Document (.fodt) - + novelWriter HTML (.html) HTML de novelWriter (.html) - + novelWriter Markup (.txt) Etiquetado de novelWriter (.txt) - + Standard Markdown (.md) Markdown Estándar (.md) - + Extended Markdown (.md) Markdown Ampliado (.md) - + JSON + novelWriter HTML (.json) JSON + HTML de novelWriter (.json) - + JSON + novelWriter Markup (.json) JSON + Etiquetado de novelWriter (.json) + + + Square + + + + + Triangle + + + + + Nabla + + + + + Diamond + + + + + Pentagon + + + + + Hexagon + + + Star + + + + + Pacman + + + + + 1/4 Circle + + + + + Half Circle + + + + + 3/4 Circle + + + + + Full Circle + + + + + 1 Bar + + + + + 2 Bars + + + + + 3 Bars + + + + + 4 Bars + + + + + 1 Block + + + + + 2 Blocks + + + + + 3 Blocks + + + + + 4 Blocks + + + + Text files Archivos de texto - + Markdown files Archivos de Markdown - + novelWriter files Archivos de novelWriter - + CSV files Archivos CSV - + All files Todos los archivos - + Millimetres Milímetros - + Centimetres Centímetros - + Inches Pulgadas - + A4 A4 - + A5 A5 - + A6 A6 - + US Legal Legal / Oficio - + US Letter Letter / Carta - + Straight single quotation mark Apóstrofo adireccional - + Straight double quotation mark Comillas adireccionales - + Left single quotation mark Comilla simple de apertura - + Right single quotation mark Comilla simple de cierre - + Single low-9 quotation mark Comilla baja simple de cierre - + Single high-reversed-9 quotation mark Comilla alta simple de apertura - + Left double quotation mark Comilla doble de apertura - + Right double quotation mark Comilla doble de cierre - + Double low-9 quotation mark Comilla baja doble de cierre - + Double high-reversed-9 quotation mark Comilla alta doble de apertura - + Double low-reversed-9 quotation mark Comilla baja doble de apertura - + Single left-pointing angle quotation mark Comilla angular simple de apertura - + Single right-pointing angle quotation mark Comilla angular simple de cierre - + Double left-pointing angle quotation mark Comilla angular de apertura - + Double right-pointing angle quotation mark Comilla angular de cierre - + Left corner bracket Soporte de la esquina izquierda - + Right corner bracket Soporte de la esquina derecha - + Left white corner bracket Soporte de esquina blanco izquierdo - + Right white corner bracket Soporte de equina blanco derecho @@ -704,38 +814,38 @@ GuiBuildSettings - - + + Manuscript Build Settings Opciones de Compilación del Manuscrito - + Name Nombre - + Selection Selección - + Headings Títulación - + Content Contenidos - + Format Formato - + Output Grabado @@ -783,7 +893,7 @@ No se pudo procesar el archivo de diccionario - + Added: {0} [{1}B] Agregado: {0} [{1}B] @@ -791,22 +901,22 @@ GuiDocEditFooter - + Line: {0} ({1}) Línea: {0} ({1}) - + Words: {0} ({1}) Palabras: {0} ({1}) - + Words: {0} selected Palabras: {0} seleccionadas - + Status Estado @@ -814,27 +924,27 @@ GuiDocEditHeader - + Toggle Tool Bar Alternar Barra de Herramientas - + Outline Estructura - + Search Buscar - + Toggle Focus Mode Alternar el Modo Enfocado - + Close Cerrar @@ -842,62 +952,62 @@ GuiDocEditSearch - + Search for Buscar - + Replace with Reemplazar con - + Search Buscar - + Case Sensitive Sensibilidad a Mayúsculas y Minúsculas - + Whole Words Only Sólo Palabras Enteras - + RegEx Mode Modo ExReg - + Loop Search Reiniciar la Búsqueda - + Search Next File Buscar en el Siguiente Archivo - + Preserve Case Conservar Mayúsculas y Minúsculas - + Close Search Cerrar la Búsqueda - + Find in current document Buscar en el documento actual - + Find and replace in current document Buscar y reemplazar en el documento actual @@ -905,122 +1015,122 @@ GuiDocEditor - + Opened Document: {0} Se Abrió el Documento: {0} - + This document has been changed outside of novelWriter while it was open. Overwrite the file on disk? Este documento ha cambiado por fuera de novelWriter estando abierto. ¿Sobreescribir en el disco? - + Could not save document. No se puedo guardar el documento. - + Saved Document: {0} Documento Guardado: {0} - + Spell checking requires the package PyEnchant. It does not appear to be installed. Para la corrección ortográfica se requiere del paquete PyEnchant. Parece que no se encuentra instalado. - + Spell check complete Se completó la comprobación ortográfica - + Document Details Detalles del Documento - + Created: {0} Creación: {0} - + Updated: {0} Actualizado en: {0} - + File Location: {0} Ubicación del Archivo: {0} - + Set as Document Name Elegir como Nombre del Documento - + Follow Tag Continuar a Etiqueta - + Create Note for Tag Crear Nota para la Etiqueta - + Cut Cortar - + Copy Copiar - + Paste Pegar - + Select All Seleccionar Todo - + Select Word Seleccionar Palabra - + Select Paragraph Seleccionar Párrafo - + Spelling Suggestion(s) Sugerencia(s) de Ortografía - + No Suggestions No Hay Sugerencias - + Add Word to Dictionary Añadir Palabra al Diccionario - + Please select some text before calling replace quotes. Por favor seleccione algo del texto antes de intentar reemplazar las comillas. - + Do you want to create a new project note for the tag '{0}'? ¿Desea crear una nueva nota del proyecto para la etiqueta '{0}'? @@ -1104,52 +1214,52 @@ GuiDocToolBar - + Markdown Bold Negrita (de Markdown) - + Markdown Italic Cursiva (de Markdown) - + Markdown Strikethrough Tachado (de Markdown) - + Shortcode Bold Negrita (en código) - + Shortcode Italic Cursiva (en código) - + Shortcode Strikethrough Tachado (en código) - + Shortcode Underline Subrayado (en código) - + Shortcode Highlight Resaltado (en código) - + Shortcode Superscript Superíndice (en código) - + Shortcode Subscript Subíndice (en código) @@ -1157,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel Mostrar / Ocultar Panel del Visualizador - + Comments Comentarios - + Show Comments Mostrar los Comentarios - + Synopsis Sinopsis - + Show Synopsis Comments Mostrar las Sinopsis @@ -1185,27 +1295,27 @@ GuiDocViewHeader - + Outline Estructura - + Go Backward Ir Atrás - + Go Forward Ir Adelante - + Reload Actualizar - + Close Cerrar @@ -1213,27 +1323,27 @@ GuiDocViewer - + An error occurred while generating the preview. Ocurrió un error al generar la vista previa. - + Copy Copiar - + Select All Seleccionar Todo - + Select Word Seleccionar Palabra - + Select Paragraph Seleccionar Párrafo @@ -1254,12 +1364,12 @@ GuiEditLabel - + Item Label Rótulo del Ítem - + Label Rótulo @@ -1267,37 +1377,37 @@ GuiItemDetails - + Label Rótulo - + Status Estado - + Class Clase - + Usage Uso - + Characters Caracteres - + Words Palabras - + Paragraphs Párrafos @@ -1305,27 +1415,27 @@ GuiLipsum - + Insert Placeholder Text Insertar Texto para Rellenar - + Insert Lorem Ipsum Text Insertar texto Lorem Ipsum - + Number of paragraphs Número de párrafos - + Randomise order Orden aleatorio - + Insert Insertar @@ -1333,78 +1443,78 @@ GuiMain - + novelWriter is ready ... novelWriter ya está listo... - + You are now running novelWriter version {0}. Está usando la versión {0} de novelWriter. - + Please check the {0}release notes{1} for further details. Por favor, revise las {0}notas de la versión{1} para más detalles. - + Close the current project? ¿Cerrar el proyecto actual? - - + + Changes are saved automatically. Los cambios se guardan automáticamente. - + Backup the current project? ¿Respaldar datos del proyecto actual? - + The project is already open by another instance of novelWriter, and is therefore locked. Override lock and continue anyway? El proyecto ya se ha abierto en otra instancia de novelWriter, y por lo tanto está bloqueado. ¿Interrumpir el bloqueo y continuar de todos modos? - + 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. Nota: Si el programa o la computadora dejaron de funcionar, se puede quitar el bloqueo con toda seguridad. No se recomienda en el caso de que otra instancia activa de novelWriter haya abierto el proyecto. En tal caso éste podrá entrar en corrupción. - + The project was locked by the computer '{0}' ({1} {2}), last active on {3}. El proyecto fue bloqueado por el equipo '{0}' ({1} {2}), por última vez activo el {3}. - + The project index is outdated or broken. Rebuilding index. El índice del proyecto está dañado o desactualizado. Recomponiendo el índice. - + Import File Importar un Archivo - + Could not read file. The file must be an existing text file. No se pudo leer el archivo. El archivo debe ser un archivo de texto existente. - + Please open a document to import the text file into. Por favor abra un documento en el cual importar el archivo de texto. - + Importing the file will overwrite the current content of the document. Do you want to proceed? El contenido actual del documento será sobrescrito al importar el archivo. ¿Desea continuar? - + Indexing completed in {0} ms Se completó el indexado en {0} ms @@ -1414,22 +1524,22 @@ El índice del proyecto se ha reconstruido con éxito. - + Could not initialise the dialog. No se pudo inicializar el diálogo. - + Do you want to exit novelWriter? ¿Desea salir de novelWriter? - + Some changes will not be applied until novelWriter has been restarted. Algunos cambios no se aplicarán hasta haber reiniciado 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}. No se pudo encontrar la referencia para la etiqueta '{0}'. O no existe, o se ha desactualizado el índice. Éste se puede actualizar desde el menú Herramientas, o presionando {1}. @@ -1573,13 +1683,13 @@ - Go to Project Tree - Ir al Árbol del Proyecto + Go to Tree View + - Go to Document Editor - Ir al Editor de Documentos + Go to Document + @@ -1797,297 +1907,302 @@ Texto para Rellenar - + + Footnote + + + + &Format &Formato - + Bold Negrita - + Italic Cursiva - + Strikethrough Tachado - + Wrap Double Quotes Envolver con Comillas Dobles - + Wrap Single Quotes Envolver con Comillas Simples - + More Formats ... Más Formatos... - + Bold (Shortcode) Negrita (Código) - + Italics (Shortcode) Cursiva (Código) - + Strikethrough (Shortcode) Tachado (Código) - + Underline Subrayado - + Highlight Resaltar - + Superscript Superíndice - + Subscript Subíndice - + Heading 1 (Partition) Título 1 (Partición) - + Heading 2 (Chapter) Título 2 (Capítulo) - + Heading 3 (Scene) Título 3 (Escena) - + Heading 4 (Section) Título 4 (Sección) - + Novel Title Título de la Novela - + Unnumbered Chapter Capítulo Sin Número - + Alternative Scene Escena Alternativa - + Align Left Alinear a la Izquierda - + Align Centre Alinear al Centro - + Align Right Alinear a la Derecha - + Indent Left Indentar a la Izquierda - + Indent Right Indentar a la Derecha - + Toggle Comment Alternar a Comentario - + Toggle Ignore Text Ignorar Texto - + Remove Block Format Quitar Formato del Bloque - + Replace Straight Single Quotes Reemplazar Apóstrofos - + Replace Straight Double Quotes Reemplazar Comillas ASCII - + Remove In-Paragraph Breaks Quitar los Quiebres de Párrafo - + &Search &Búsqueda - + Find Buscar - + Replace Reemplazar - + Find Next Buscar Siguiente - + Find Previous Buscar Anterior - + Replace Next Reemplazar Siguiente - + Find in Project Buscar en el Proyecto - + &Tools &Herramientas - + Check Spelling Comprobar la Ortografía - + Spell Check Language Idioma de la Comprobación Ortográfica - + Default Por defecto - + Re-Run Spell Check Reiniciar la Comprobación Ortográfica - + Project Word List Lista de Palabras del Proyecto - + Add Dictionaries Agregar Diccionarios - + Rebuild Index Reconstruir el Índice - + Backup Project Crea una copia de seguridad del proyecto - + Build Manuscript Compilar el Manuscrito - + Writing Statistics Estadísticas de Redacción - + Preferences Preferencias - + &Help &Ayuda - + About novelWriter Acerca de novelWriter - + About Qt5 Acerca de Qt5 - + User Manual (Online) Manual de Usuario (En línea) - + User Manual (PDF) Manual de Usuario (PDF) - + Report an Issue (GitHub) Reportar un Problema (GitHub) - + Ask a Question (GitHub) Hacer una Pregunta (GitHub) - + The novelWriter Website El Sitio Web de novelWriter @@ -2096,22 +2211,22 @@ GuiMainStatus - + None Ninguno - + Editor Editor - + Project Proyecto - + Session Time Tiempo de la Sesión @@ -2134,63 +2249,63 @@ GuiManuscript - + Build Manuscript Compilar Manuscrito - + Add New Build Añadir una Nueva Compilación - + Delete Selected Build Eliminar la Compilación Seleccionada - + Edit Selected Build Editar la Compilación Seleccionada - + Builds Compilaciones - + Details Detalles - + Outline Estructura - + Preview Vista Previa - + Print Imprimir - + Build Compilar - + Close Cerrar - - + + My Manuscript Mi Manuscrito @@ -2256,18 +2371,18 @@ GuiNovelDetails - - + + Novel Details Detalles de la Novela - + Overview Resumen - + Contents Contenido @@ -2275,58 +2390,58 @@ GuiNovelToolBar - + Outline of {0} Estructura de {0} - + Novel Root Raíz de la Novela - + Refresh Actualizar - + Last Column Última Columna - + Hidden Ocultar - + Point of View Character Personaje Vehículo del Punto de Vista - + Focus Character Personaje bajo Enfoque - + Novel Plot Argumento de la Novela - - + + Column Size Tamaño de Columna - + More Options Más Opciones - + Maximum column size in % Tamaño de columna máximo en % @@ -2334,7 +2449,7 @@ GuiNovelTree - + No meta data Sin metadatos @@ -2342,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title Título - + Chapter Capítulo - + Scene Escena - + Section Sección - + Document Documento - + Status Estado - + Characters Personajes - + Words Palabras - + Paragraphs Párrafos - + Synopsis Sinopsis - + Title Details Detalles del Título - + Reference Tags Etiquetado @@ -2407,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns Escoger Columnas @@ -2415,17 +2530,17 @@ GuiOutlineToolBar - + Outline of Estructura de - + Refresh Actualizar - + Export CSV Exportar a CSV @@ -2433,7 +2548,7 @@ GuiOutlineTree - + Save Outline As Guardar Estructura Como @@ -2441,553 +2556,589 @@ GuiPreferences - - + + Preferences Preferencias - + Search Buscar - + General General - + Appearance Apariencia - + Display language Idioma - - - + + Requires restart to take effect. Se requiere reiniciar la aplicación para surtir efecto. - + Colour theme Tema de colores - + General colour theme and icons. Tema general de colores y de íconos. - - Application font family - Tipografía de la aplicación + + Application font + - - Application font size - Tamaño de la tipografía - - - - - pt - pt - - - + Hide vertical scroll bars in main windows Esconder las barras de desplazamiento vertical en las ventanas principales - - + + Scrolling available with mouse wheel and keys only. Se podrá desplazar solamente por medio del ratón y de las teclas. - + Hide horizontal scroll bars in main windows Esconder las barras de desplazamiento horizontal en las ventanas principales + + + Use the system's font selection dialog + + + Turn off to use the Qt font dialog, which may have more options. + + + + Document Style Estilo del Documento - + Document colour theme Tema de colores del documento - + Colour theme for the editor and viewer. Tema de colores del editor y del visualizador. - - Document font family - Tipografía del documento + + Document font + - - - - + + + Applies to both document editor and viewer. A usar tanto en el editor como en el visualizador de documentos. - - Document font size - Tamaño de la tipografía - - - + Emphasise partition and chapter labels Enfatizar etiquetado de particiones y capítulos - + Makes them stand out in the project tree. Se las destaca en el árbol del proyecto. - + Show full path in document header Mostrar la ruta completa del documento en el encabezado - + Add the parent folder names to the header. Añade los nombres de carpetas superiores al encabezado. - + Include project notes in status bar word count Incluir a las notas del proyecto en el total de palabras - + Auto Save Autoguardado - + Save document interval Intervalo para guardar el documento - + How often the document is automatically saved. Con qué frecuencia se guardará automáticamente el documento actual. - - + + seconds segundos - + Save project interval Intervalo para guardar el proyecto - + How often the project is automatically saved. Con qué frecuencia se guardará automáticamente el proyecto actual. - + Project Backup Respaldado de Datos del Proyecto - + Browse Abrir ubicación - + Backup storage location Ubicación de la copia de seguridad - - + + Path: {0} Ruta destino: {0} - + Run backup when the project is closed Crear una copia de seguridad cuando se cierre el proyecto - + Can be overridden for individual projects in Project Settings. Puede anularse para un proyecto individual en la Configuración del Proyecto. - + Ask before running backup Preguntar antes de respaldar - + If off, backups will run in the background. De lo contrario se crearán las copias de seguridad en segundo plano. - + Session Timer Tiempo de la Sesión - + Pause the session timer when not writing Poner el tiempo de la sesión en pausa cuando no se esté escribiendo - + Also pauses when the application window does not have focus. Además lo pone en pausa cuando la ventana de la aplicación no tenga el foco. - + Editor inactive time before pausing timer Lapso de inacción antes de poner el tiempo en pausa - + User activity includes typing and changing the content. Las acciones incluyen tipear y modificar el contenido. - + minutes minutos - + Writing Escritura - + Text Flow Flujo del Texto - + Maximum text width in "Normal Mode" Anchura máxima del texto en "Modo Normal" - + Set to 0 to disable this feature. Establecer en 0 para desactivar esta función. - - - - + + + + px px - + Maximum text width in "Focus Mode" Anchura máxima del texto en "Modo Enfocado" - + The maximum width cannot be disabled. La anchura máxima no se puede desactivar. - + Hide document footer in "Focus Mode" Ocultar el pie del documento en el "Modo Enfocado" - + Hide the information bar in the document editor. Oculta la barra de información del editor del documento. - + Justify the text margins Justificar los márgenes del texto - + Minimum text margin Margen mínimo del texto - + Tab width Anchura de la tabulación por tecla Tab - + The width of a tab key press in the editor and viewer. El ancho de una tabulación producido en el editor y el visualizador. - + Text Editing Edición - + Spell check language Idioma a comprobar la ortografía - + Available languages are determined by your system. Su sistema determinará los idiomas disponibles. - + Auto-select word under cursor Seleccionar la palabra bajo el cursor - + Apply formatting to word under cursor if no selection is made. De no haber selección se aplicará el formato a la palabra situada bajo el cursor. - + Show tabs and spaces Mostrar tabulaciones y espacios - + Show line endings Mostrar fin de línea - + Editor Scrolling Desplazamiento del Editor - + Scroll past end of the document Desplazar más allá del final del documento - + Also centres the cursor when scrolling. También centra el cursor al desplazarse. - + Typewriter style scrolling when you type Desplazamiento estilo "máquina de escribir" cuando teclea - + Keeps the cursor at a fixed vertical position. Conservará el cursor de texto en una posición vertical fija. - + Minimum position for Typewriter scrolling Posicionamiento mínimo para desplazar tipo "Máquina de escribir" - + Percentage of the editor height from the top. Un porcentaje de la altura del editor desde el tope. - + Text Highlighting Resaltado - - Highlight text wrapped in quotes - Resaltar el texto entrecomillado + + None + Ninguno - - - - Applies to the document editor only. - Se usará solo en el editor de documentos. + + Single Quotes + + + + + Double Quotes + + + + + Both + + + + + Highlight dialogue + + + + + Applies to the selected quote styles. + + + + + Allow open-ended dialogue + - Allow open-ended single quotes - Permitir comillas simples sin cierre + Highlight dialogue line with no closing quote. + - - Highlight single-quoted line with no closing quote. - Se resaltará la línea de la comilla simple sin una comilla de cierre. + + Dialogue narrator break symbol + - - Allow open-ended double quotes - Permitir comillas dobles sin cierre + + Symbol to indicate injected narrator break. + - - Highlight double-quoted line with no closing quote. - Se resaltará la línea de comillas dobles sin comillas de cierre. + + Dialogue line symbol + - + + Lines starting with this symbol are dialogue. + + + + + Alternative dialogue symbols + + + + + Custom highlighting of dialogue text. + + + + Add highlight colour to emphasised text Añadir resalte de color al texto enfatizado - + + + Applies to the document editor only. + Se usará solo en el editor de documentos. + + + Highlight multiple or trailing spaces Resaltar espacios múltiples o finales - + Text Automation Automatización - + Auto-replace text as you type Reemplazar el texto mientras se escribe - + Allow the editor to replace symbols as you type. Permite al editor reemplazar símbolos mientras tipea. - + Auto-replace single quotes Reemplazar comillas simples - - + + Try to guess which is an opening or a closing quote. Se intentará adivinar cuáles comillas son de apertura o de cierre. - + Auto-replace double quotes Reemplazar comillas dobles - + Auto-replace dashes Reemplazar guiones - + Double and triple hyphens become short and long dashes. Los guiones dobles y triples se convertirán en rayas cortas y largas. - + Auto-replace dots Reemplazar puntos - + Three consecutive dots become ellipsis. Tres puntos consecutivos se convierten en el carácter de puntos suspensivos. - + Insert non-breaking space before Insertar un espacio duro previo a - + Automatically add space before any of these symbols. Añade un espacio indivisible automáticamente delante de un símbolo de esta lista. - + Insert non-breaking space after Insertar un espacio duro posterior a - + Automatically add space after any of these symbols. Añade un espacio indivisible automáticamente detrás de un símbolo de esta lista. - + Use thin space instead Pero espaciar con un espacio duro fino - + Inserts a thin space instead of a regular space. Inserta un espacio indivisible más estrecho en lugar de un espacio duro regular. - + Quotation Style Empleo de Comillas - + Single quote open style Estilo de comilla de apertura simple - + The symbol to use for a leading single quote. El símbolo a usar para una comilla de apertura simple. - + Single quote close style Estilo de comilla de cierre simple - + The symbol to use for a trailing single quote. El símbolo a usar para una comilla de cierre simple. - + Double quote open style Estilo de comilla de apertura doble - + The symbol to use for a leading double quote. El símbolo a usar para una comilla de apertura doble. - + Double quote close style Estilo de comilla de cierre doble - + The symbol to use for a trailing double quote. El símbolo a usar para una comilla de cierre doble. - + Backup Directory Directorio de la Copia de Seguridad @@ -3023,28 +3174,28 @@ GuiProjectSettings - - + + Project Settings Configuración del Proyecto - + Settings Configuración - + Status Estado - + Importance Importancia - + Auto-Replace Reemplazos @@ -3052,47 +3203,47 @@ GuiProjectToolBar - + Project Content Contenido del Proyecto - + Quick Links Enlaces Rápidos - + Move Up Mover Arriba - + Move Down Mover Abajo - + Add Item Añadir Ítem - + Expand All Expandir Todo - + Collapse All Contraer Todo - + Empty Trash Vaciar la Papelera - + More Options Más Opciones @@ -3100,122 +3251,130 @@ GuiProjectTree - + Active En uso - + Inactive Sin uso - + Permanently delete {0} file(s) from Trash? ¿Eliminar {0} archivo(s) permanentemente de la Papelera? - + Did not find anywhere to add the file or folder! ¡No se encontró dónde añadir el archivo o carpeta! - + Cannot add new files or folders to the Trash folder. No se puede añadir nuevos archivos o carpetas a la carpeta Papelera. - + New Note Nota nueva - + New Chapter Capítulo Nuevo - + New Scene Escena Nueva - + New Document Documento Nuevo - + New Folder Nueva Carpeta - + There is currently no Trash folder in this project. No hay actualmente una carpeta Papelera en este proyecto. - + The Trash folder is already empty. La carpeta Papelera ya está vacía. - + Move '{0}' to Trash? ¿Mover '{0}' a la Papelera? - + Root folders can only be deleted when they are empty. Las carpetas raíz sólo pueden eliminarse si están vacías. - + Permanently delete '{0}'? ¿Eliminar Permanentemente '{0}'? - + Drag and drop is only allowed for single items, non-root items, or multiple items with the same parent. Sólo se permite arrastrar y soltar de a un solo elemento, o de a múltiples elementos no raíz o con el mismo elemento superior. - + No documents selected for merging. No se han seleccionado documentos para combinar. - + Merged Combinado - - + + Could not write document content. No se pudo escribir el contenido del documento. - + Do you want to duplicate this document? ¿Desea duplicar este documento? - + Do you want to duplicate this item and all child items? ¿Desea duplicar este ítem y todos sus ítems secundarios? - + Could not duplicate all items. No se ha podido duplicar todos los ítems. - + There is nowhere to add item with name '{0}'. No hay ningún lugar en el que añadir un ítem nombrado '{0}'. + + GuiQuoteSelect + + + Select Quote Style + + + GuiSideBar @@ -3300,33 +3459,33 @@ GuiWordList - - + + Project Word List Lista de Palabras del Proyecto - + Import words from text file Importar palabras desde un archivo de texto - + Export words to text file Exportar palabras a un archivo de texto - + Note: The import file must be a plain text file with UTF-8 or ASCII encoding. Nota: El archivo a importar debe ser un archivo de texto plano (codificación UTF-8 o ASCII). - + Import File Importar desde Archivo - + Export File Exportar a Archivo @@ -3334,147 +3493,147 @@ GuiWritingStats - + Writing Statistics Estadísticas de Redacción - + Session Start Inicio de la Sesión - + Length Duración - + Idle Inactividad - + Words Palabras - + Histogram Histograma - + Sum Totals Totales Agregados - + Total Time: Tiempo Total: - + Idle Time: Tiempo de Inactividad: - + Filtered Time: Tiempo con Filtros: - + Novel Word Count: Total de Palabras de Novela: - + Notes Word Count: Total de Palabras de Notas: - + Total Word Count: Total de Palabras: - + Filters Filtros - + Count novel files Contar archivos de novela - + Count note files Contar archivos de notas - + Hide zero word count No mostrar totales en cero - + Hide negative word count No mostrar totales negativos - + Group entries by day Agrupar entradas por día - + Show idle time Mostrar tiempo de inactividad - + Word count cap for the histogram Límite de total de palabras para el histograma - + Save As Guardar Como - + JSON Data File (.json) Archivo de Datos JSON (.json) - + CSV Data File (.csv) Archivo de Datos CSV (.csv) - + JSON Data File Archivo de Datos JSON - + CSV Data File Archivo de Datos CSV - + Save Data As Guardar Datos Como - + {0} file successfully written to: El archivo {0} se ha guardado con éxito en: - + Failed to write {0} file. Hubo una falla al escribir el archivo {0}. @@ -3482,153 +3641,153 @@ NWProject - + Could not delete document file. No se puedo eliminar el archivo de documento. - + Not a known project file format. Formato de archivo de proyecto desconocido. - + Project file not found. No se ha encontrado el archivo de proyecto. - + Failed to open project. Hubo una falla al abrir el proyecto. - + Unknown Desconocido - + Project file does not appear to be a novelWriterXML file. Aparentemente el archivo del proyecto no es un archivo novelWriterXML. - + 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}. Formato de archivo de proyecto novelWriter desconocido, o no soportado. Esta versión de novelWriter no puede abrir el proyecto. El archivo se guardó con la versión {0} de novelWriter. - + Failed to parse project xml. Hubo una falla al procesar el xml del proyecto. - + 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? Se está por actualizar el formato de archivo de su proyecto. De continuar, ninguna versión anterior de novelWriter podrá abrir este proyecto. ¿Continuar? - + 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? Este proyecto se ha guardado en una versión nueva de novelWriter, la versión {0}. Ésta es la versión {1}. Si procede a abrir el proyecto, algunos atributos y opciones no serán preservadas, pero en general el proyecto no presentará problemas. ¿Continuar abriendo el proyecto? - + Recovered Restaurado - + Found {0} orphaned file(s) in the project. {1} file(s) were recovered. Se ha(n) encontrado {0} archivo(s) sin vinculación en el proyecto. Se ha(n) recuperado {1} archivo(s). - + Opened Project: {0} Se Abrió el Proyecto: {0} - + There is no project open. No hay ningún proyecto abierto. - + Failed to save project. Hubo una falla al guardar el proyecto. - + Saved Project: {0} Proyecto Guardado: {0} - + Backing up project ... Respaldando el proyecto... - + Cannot backup project because no project name is set. Please set a Project Name in Project Settings. No se puede crear una copia de seguridad porque no se estableció el nombre del proyecto. Por favor escoja un Nombre de Proyecto en la Configuración del Proyecto. - + Could not create backup folder. No se pudo crear la carpeta de respaldo. - + Created a backup of your project of size {0}B. Se ha creado una copia de seguridad del proyecto de {0}B de tamaño. - + Path: {0} Ruta destino: {0} - + Could not write backup archive. No se puedo escribir el archivo de respaldo. - + Project backed up to '{0}' Se ha respaldado el proyecto en '{0}' - - + + New Nuevo - + Note Nota - + Draft Borrador - + Finished Terminado - + Minor Menor - + Major Mayor - + Main Principal @@ -3644,89 +3803,89 @@ ProjectBuilder - + The target folder is not empty. Please choose another folder. La carpeta de destino no está vacía. Por favor, elija otra. - + An error occurred while trying to create the project. Ocurrió un error mientras se intentaba crear el proyecto. - + New Project Proyecto Nuevo - + Title Page Título de la Página - + By Por - + Summary of the chapter. Resumen del capítulo. - + Summary of the scene. Resumen de la escena. - + A short description. Una breve descripción. - + Chapter {0} Capítulo {0} - - + + Scene {0} Escena {0} - + Main Plot Argumento Principal - + Protagonist Protagonista - + Main Location Lugar Principal - - + + The target folder already exists. Please choose another folder. La carpeta de destino ya existe. Por favor, elija otra. - + Could not copy project files. No se han podido copiar los archivos del proyecto. - + Failed to create a new example project. Hubo una falla al crear un nuevo proyecto de ejemplo. - + Failed to create a new example project. Could not find the necessary files. They seem to be missing from this installation. Hubo una falla al crear un nuevo proyecto de ejemplo. No se pudieron encontrar los archivos necesarios. Aparentemente esta instalación carece de ellos. @@ -3863,20 +4022,25 @@ SharedData - + novelWriter Project File or Zip File Archivo de proyecto de novelWriter o archivo Zip - + novelWriter Project File Archivo de Proyecto de novelWriter - + Open Project Abrir un Proyecto + + + Select Font + + VersionInfoWidget @@ -3924,57 +4088,57 @@ _ContentsPage - + Table of Contents Tabla de Contenido - + Title Título - + Words Palabras - + Pages Páginas - + Page Página - + Progress Progreso - + Words per page Palabras por página - + First page offset Desfase de la primera página - + Chapters on odd pages Capítulos en páginas impares - + Untitled Sin Título - + END FIN @@ -3982,32 +4146,32 @@ _DetailsWidget - + Setting Opciones - + Value Valores Definidos - + Name Nombre - + Selection Selecciones - + Title Título - + Hidden Oculto @@ -4015,37 +4179,37 @@ _FilterTab - + Included in manuscript A incluir en el manuscrito - + Excluded from manuscript A excluir del manuscrito - + Always included Incluir de todos modos - + Always excluded Excluir de todos modos - + Reset to default Restablecer a por defecto - + Mark selection as Ajustar la selección a: - + Select Root Folders Carpetas Raíz a Seleccionar @@ -4053,22 +4217,22 @@ _GuiAlert - + Information Información - + Warning Advertencia - + Error Error - + Question Pregunta @@ -4076,93 +4240,93 @@ _HeadingsTab - + Hide Omitir - - + + Editing: {0} Editando: {0} - - + + None Ninguno - + Title Título - + Chapter Number Numeral del Capítulo - + Chapter Number (Word) Numeral del Capítulo (En Palabras) - + Chapter Number (Upper Case Roman) Numeral Romano del Capítulo (Mayúsculas) - + Chapter Number (Lower Case Roman) Numeral Romano del Capítulo (Minúsculas) - + Scene Number (In Chapter) Numeral de la Escena (En el Capítulo) - + Scene Number (Absolute) Numeral de la Escena (Valor Absoluto) - + Point of View Character Perspectiva - + Focus Character Personaje Central - + Insert Insertar - + Apply Aplicar - + Additional Styling Estilos Adicionales - - - + + + Centre Centrado - - - + + + Page Break Salto de Página @@ -4170,117 +4334,117 @@ _NewProjectForm - + Required Requerido - + Optional Opcional - + Create a fresh project Crear un nuevo proyecto - + Create an example project Crear un ejemplo de proyecto - + Copy an existing project Copiar un proyecto existente - + Project Name Nombre del Proyecto - + Author Autor(es) - + Project Path Ruta del Proyecto - + Prefill Project Rellenar el Proyecto - + Set to 0 to only add scenes Escoger 0 para solo añadir escenas - + Add {0} chapter documents Incluir {0} capítulos - + Add {0} scene documents (to each chapter) Incluir {0} escenas (a cada capítulo) - + Add a folder for plot notes Añadir una carpeta para notas argumentales - + Add a folder for character notes Añadir una carpeta para notas sobre los personajes - + Add a folder for location notes Añadir una carpeta para notas acerca de los lugares - + Add example notes to the above Añadir ejemplos de notas - + Chapters and Scenes Capítulos y Escenas - + Project Notes Notas del Proyecto - + Create New Project Crear un Proyecto Nuevo - + Select Project Folder Escoger la Carpeta del Proyecto - + Fresh Project Proyecto vacío - + Example Project Ejemplo de Proyecto - + Template: {0} Plantilla: {0} @@ -4288,7 +4452,7 @@ _NewProjectPage - + A project name is required. Se requiere un nombre de proyecto. @@ -4296,27 +4460,27 @@ _OpenProjectPage - + The project path is not reachable. No se puede acceder a la ruta del proyecto. - + Path Ruta - + Remove '{0}' from the recent projects list? The project files will not be deleted. ¿Eliminar '{0}' de la lista de proyectos recientes? Los archivos del proyecto no se eliminarán. - + Open Project Abrir un Proyecto - + Remove Project Eliminar Proyecto @@ -4324,54 +4488,54 @@ _OverviewPage - + Project Proyecto - - + + Name Nombre - + Revisions Revisiones - + Editing Time Tiempo de Edición - - + + Word Count Total de Palabras - + In Novels En Novelas - + In Notes En Notas - + Selected Novel Novela seleccionada - + Chapters Capítulos - + Scenes Escenas @@ -4379,40 +4543,40 @@ _PreviewWidget - + Press the "Preview" button to generate ... Pulse el botón "Vista Previa" para así generarla... - + Processing ... Procesando... - + Done Hecho - - Unknown - Desconocido - - - + Built Compilado + + + No Preview + + _ProjectListModel - + Word Count Total de Palabras - + Last Opened Abierto por última vez @@ -4420,77 +4584,77 @@ _ReplacePage - + Text Auto-Replace for Preview and Build Lista de Reemplazos de Texto para Previsualizar y Compilar - + Keyword Palabra Clave - + Replace With Reemplazar Por - + Select item to edit Seleccionar el ítem a editar - - Save - Guardar + + Apply + Aplicar _SettingsPage - + Project name Nombre del proyecto - + Changing this will affect the backup path. Cambiar esto afectará a la ruta de la copia de seguridad. - + Author(s) Autores - - + + Only used when building the manuscript. Se utiliza solo al compilar el manuscrito. - + Project language Idioma del proyecto - + Default Por defecto - + Spell check language Idioma a comprobar la ortografía - - + + Overrides main preferences. Anulará a la configuración principal. - + Disable backup on close No crear copia de seguridad al cerrar @@ -4498,59 +4662,59 @@ _StatsWidget - - + + Words Palabras - - + + Characters Caracteres - + Words in Headings Palabras en Titulos - + Words in Text Palabras en el Texto - + Headings Títulos - + Paragraphs Párrafos - + Characters in Headings Caracteres en los Títulos - + Characters in Text Caracteres en el Texto - + Characters, No Spaces Caracteres, Sin Espacios - + Characters in Headings, No Spaces Caracteres en los Títulos, Sin Espacios - + Characters in Text, No Spaces Caracteres en el Texto, Sin Espacios @@ -4558,196 +4722,216 @@ _StatusPage - + Novel Document Status Levels Estados de los Documentos de Novela - + Project Note Importance Levels Prioridades de las Notas del Proyecto - - Label - Rótulo - - - - Usage - Uso - - - - Select item to edit - Seleccionar el ítem a editar - - - - Colour - Color - - - - Save - Guardar - - - - Select Colour - Escoger un Color - - - - New Item - Nuevo Ítem - - - - Cannot delete a status item that is in use. - No se puede eliminar un ítem de estado actualmente en uso. - - - + Not in use No está en uso - + Used once Un ítem lo usa - + Used by {0} items {0} ítems lo usan + + + Select Colour + Escoger un Color + + + + Label + Rótulo + + + + Usage + Uso + + + + Select item to edit + Seleccionar el ítem a editar + + + + Colour + Color + + + + Circles ... + + + + + Bars ... + + + + + Blocks ... + + + + + Shape + + + + + Apply + Aplicar + + + + New Item + Nuevo Ítem + + + + Cannot delete a status item that is in use. + No se puede eliminar un ítem de estado actualmente en uso. + _TreeContextMenu - + Empty Trash Vaciar la Papelera - + Rename Renombrar - + Open Document Abrir el Documento - + View Document Visualizar el Documento - + Create New ... Crear Nuevo... - + Rename to Heading Renombrar a Título - + Set Active to ... Inclusión... - + Toggle Active Alternar su Inclusión - + Set Status to ... Cambiar el Estado a... - - + + Manage Labels ... Administrar las Etiquetas... - + Set Importance to ... Importancia... - + Transform ... Transformar... - - - - + + + + Convert to {0} Convertir a {0} - + Merge Child Items into Self Combinar Ítems Descendientes con sí mismo - + Merge Child Items into New Combinar los Ítems Descendientes en uno Nuevo - + Merge Documents in Folder Combinar los Documentos de la Carpeta - + Split Document by Headings Separar el Documento según Titulación - + Expand All Expandir Todo - + Collapse All Contraer Todo - + Duplicate Duplicar - - + + Delete Permanently Eliminar Permanentemente - - + + Move to Trash Mover a la Papelera - + Move {0} items to Trash? ¿Mover '{0}' ítems a la Papelera? - + Do you want to convert the folder to a {0}? This action cannot be reversed. ¿Desea convertir la carpeta a {0}? Esta acción es irreversible. @@ -4755,7 +4939,7 @@ _UpdatableMenu - + From Template A partir de Plantilla @@ -4763,12 +4947,12 @@ _ViewPanelBackRefs - + Document Documento - + First Heading Primer Título @@ -4776,27 +4960,27 @@ _ViewPanelKeyWords - + Tag Etiqueta - + Importance Importancia - + Document Documento - + Heading Título - + Short Description Breve Descripción diff --git a/i18n/nw_fr_FR.ts b/i18n/nw_fr_FR.ts index a3417a8a..853c809b 100644 --- a/i18n/nw_fr_FR.ts +++ b/i18n/nw_fr_FR.ts @@ -4,232 +4,242 @@ Builds - + Document Filters Filtres de documents - + Novel Documents Document du roman - + Project Notes Notes de projet - + Inactive Documents Documents non utilisés - + Headings En-têtes - + Partition Format Format de partie - + Chapter Format Format de chapitre - + Unnumbered Format Format non numéroté - + Scene Format Format de scène - + Alt. Scene Format Format de scène alternative - + Section Format Format de section - + Text Content Contenu du texte - + Include Synopsis Inclure le synopsis - + Include Comments Inclure les commentaires - + Include Keywords Inclure les mots-clés - + Include Body Text Inclure le corps du texte - + Ignore These Keywords Ignorer ces mots clés - + Insert Content Contenu inséré - + Add Titles for Notes Ajouter des titres pour les notes - + Text Format Format du texte - - - Font Family - Famille de police - - - - Font Size - Taille de police - + Text Font + + + + Line Height Hauteur de ligne - + Text Options Options du texte - + Justify Text Margins Justifier le texte aux marges - + Replace Unicode Characters Remplacer les caractères Unicode - + Replace Tabs with Spaces Remplacer les tabulations par des espaces - - - Page Layout - Dimensions de la page - - Unit - Unité - - - - Page Size - Taille de la page - - - - Page Width - Largeur de la page - - - - Page Height - Hauteur de la page - - - - Top Margin - Marge supérieure - - - - Bottom Margin - Marge inférieure - - - - Left Margin - Marge gauche - - - - Right Margin - Marge droite - - - - Open Document (.odt) - Open Document (.odt) - - - - Add Highlight Colours - Ajouter des couleurs de mise en évidence - - - - Page Header - Entête de la page - - - - Page Counter Offset - Décalage du compteur de page - - - - First Line Indent - Retrait de la première ligne - - - - Markdown (.md) - Markdown (.md) - - - Preserve Hard Line Breaks Préserver les retours à la ligne + + + Apply Dialogue Highlighting + + + + + First Line Indent + Retrait de la première ligne + + + + Enable Indent + + + + + Indent Width + + + + + Indent First Paragraph + + + + + Page Layout + Dimensions de la page + + + + Unit + Unité + + + + Page Size + Taille de la page + + + + Page Width + Largeur de la page + + + + Page Height + Hauteur de la page + + + + Top Margin + Marge supérieure + + + + Bottom Margin + Marge inférieure + + + + Left Margin + Marge gauche + + + + Right Margin + Marge droite + + Open Document (.odt) + Open Document (.odt) + + + + Add Highlight Colours + Ajouter des couleurs de mise en évidence + + + + Page Header + Entête de la page + + + + Page Counter Offset + Décalage du compteur de page + + + HTML (.html) HTML (.html) - + Add CSS Styles Ajouter des styles CSS - + Preserve Tab Characters Préserver les tabulations @@ -237,72 +247,72 @@ Common - + in the future dans le futur - + just now maintenant - + a minute ago il y a une minute - + {0} minutes ago il y a {0} minutes - + an hour ago il y a une heure - + {0} hours ago il y a {0} heures - + a day ago hier - + {0} days ago il y a {0} jours - + a week ago il y a une semaine - + {0} weeks ago il y a {0} semaines - + a month ago il y a un mois - + {0} months ago il y a {0} mois - + a year ago il y a un an - + {0} years ago il y a {0} ans @@ -310,375 +320,475 @@ Constant - - - + + + None Sans - + Novel Roman - - + + Plot Intrigue - - + + Characters Personnages - - + + Locations Lieux - - + + Timeline Chronologie - - + + Objects Objets - - + + Entities Entités - - - + + + Custom Personnalisé - + Archive Archive - + Templates Modèles - + Trash Corbeille - - + + Novel Document Document du roman - - + + Project Note Note du projet - + Root Folder Dossier racine - + Folder Dossier - + Novel Title Page Page de titre du roman - + Novel Chapter Chapitre du roman - + Novel Scene Scène du roman - + Novel Section Section de roman - + Tag Étiquette - + Point of View Point de vue - - + + Focus Focus - + Title Titre - + Level Niveau - + Document Document - + Line Ligne - + Chars Caractères - + Words Mots - + Pars Parties - + POV PDV - + Synopsis Synopsis - + Open Document (.odt) Open Document (.odt) - + Flat Open Document (.fodt) Flat Open Document (.fodt) - + novelWriter HTML (.html) HTML novelWriter (.htm) - + novelWriter Markup (.txt) Marquage novelWriter (.txt) - + Standard Markdown (.md) Markdown standard (.md) - + Extended Markdown (.md) Markdown étendu (.md) - + JSON + novelWriter HTML (.json) JSON + HTML novelWriter (.json) - + JSON + novelWriter Markup (.json) JSON + marquage novelWriter (.json) + + + Square + + + + + Triangle + + + + + Nabla + + + + + Diamond + + + + + Pentagon + + + + + Hexagon + + + Star + + + + + Pacman + + + + + 1/4 Circle + + + + + Half Circle + + + + + 3/4 Circle + + + + + Full Circle + + + + + 1 Bar + + + + + 2 Bars + + + + + 3 Bars + + + + + 4 Bars + + + + + 1 Block + + + + + 2 Blocks + + + + + 3 Blocks + + + + + 4 Blocks + + + + Text files Fichiers texte - + Markdown files Fichiers Markdown - + novelWriter files Fichiers novelWriter - + CSV files Fichiers CSV - + All files Tous les fichiers - + Millimetres Millimètres - + Centimetres Centimètres - + Inches Pouces - + A4 A4 - + A5 A5 - + A6 A6 - + US Legal US Legal - + US Letter US Letter - + Straight single quotation mark apostrophe - + Straight double quotation mark guillemet anglais - + Left single quotation mark guillemet-apostrophe culbuté - + Right single quotation mark guillemet-apostrophe - + Single low-9 quotation mark guillemet-virgule inférieur - + Single high-reversed-9 quotation mark guillemet-virgule supérieur culbuté - + Left double quotation mark guillemet-apostrophe double culbuté - + Right double quotation mark guillemet-apostrophe double - + Double low-9 quotation mark guillemet-virgule double inférieur - + Double high-reversed-9 quotation mark guillemet-virgule double supérieur culbuté - + Double low-reversed-9 quotation mark guillemet-virgule double inférieur culbuté - + Single left-pointing angle quotation mark guillemet simple vers la gauche - + Single right-pointing angle quotation mark guillemet simple vers la droite - + Double left-pointing angle quotation mark guillemet gauche - + Double right-pointing angle quotation mark guillemet droit - + Left corner bracket crochet en angle à gauche - + Right corner bracket crochet en angle à droite - + Left white corner bracket crochet en angle à gauche blanc - + Right white corner bracket crochet en angle à droite blanc @@ -704,38 +814,38 @@ GuiBuildSettings - - + + Manuscript Build Settings Paramètres de construction du manuscrit - + Name Nom - + Selection Sélection - + Headings En-têtes - + Content Contenu - + Format Format - + Output Sortie @@ -783,7 +893,7 @@ Impossible de traiter le fichier de dictionnaire - + Added: {0} [{1}B] Ajouté : {0} [{1}B] @@ -791,22 +901,22 @@ GuiDocEditFooter - + Line: {0} ({1}) Ligne : {0} ({1}) - + Words: {0} ({1}) Mots : {0} ({1}) - + Words: {0} selected Mots sélectionnés : {0} - + Status État @@ -814,27 +924,27 @@ GuiDocEditHeader - + Toggle Tool Bar Afficher/Masquer la barre d'outils - + Outline Plan - + Search Chercher - + Toggle Focus Mode Basculer le mode focus - + Close Fermer @@ -842,62 +952,62 @@ GuiDocEditSearch - + Search for Rechercher - + Replace with Remplacer par - + Search Chercher - + Case Sensitive Sensible à la casse - + Whole Words Only Mots entiers uniquement - + RegEx Mode Expressions régulières - + Loop Search Recherche en boucle - + Search Next File Chercher dans le fichier suivant - + Preserve Case Conserver la casse - + Close Search Terminer la recherche - + Find in current document Chercher dans le document actuel - + Find and replace in current document Chercher et remplacer dans le document actuel @@ -905,122 +1015,122 @@ GuiDocEditor - + Opened Document: {0} Document ouvert : {0} - + This document has been changed outside of novelWriter while it was open. Overwrite the file on disk? Ce document a été modifié en dehors de novelWriter pendant qu'il était ouvert. Écraser le fichier sur le disque ? - + Could not save document. Impossible d'enregistrer le document. - + Saved Document: {0} Document enregistré : {0} - + Spell checking requires the package PyEnchant. It does not appear to be installed. La vérification orthographique nécessite PyEnchant qui ne semble pas installé ici. - + Spell check complete La vérification orthographique est terminée - + Document Details Détails du document - + Created: {0} Créé : {0} - + Updated: {0} Mis à jour : {0} - + File Location: {0} Emplacement du fichier : {0} - + Set as Document Name Définir comme nom du document - + Follow Tag Suivre cette étiquette - + Create Note for Tag Créer une note pour l'étiquette - + Cut Couper - + Copy Copier - + Paste Coller - + Select All Sélectionner tout - + Select Word Sélectionner le mot - + Select Paragraph Sélectionner le paragraphe - + Spelling Suggestion(s) Orthographe suggérée - + No Suggestions Pas de suggestion - + Add Word to Dictionary Ajouter ce mot au dictionnaire - + Please select some text before calling replace quotes. Veuillez sélectionner du texte avant de demander le remplacement des guillemets. - + Do you want to create a new project note for the tag '{0}'? Voulez-vous créer une nouvelle note de projet pour l'étiquette '{0}' ? @@ -1104,52 +1214,52 @@ GuiDocToolBar - + Markdown Bold Markdown gras - + Markdown Italic Markdown italique - + Markdown Strikethrough Markdown barré - + Shortcode Bold Code court gras - + Shortcode Italic Code court italique - + Shortcode Strikethrough Code court barré - + Shortcode Underline Code court souligné - + Shortcode Highlight Surligner les codes courts - + Shortcode Superscript Code court exposant - + Shortcode Subscript Code court indice @@ -1157,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel Afficher/Masquer le panneau de visualisation - + Comments Commentaires - + Show Comments Afficher les commentaires - + Synopsis Synopsis - + Show Synopsis Comments Afficher les commentaires du synopsis @@ -1185,27 +1295,27 @@ GuiDocViewHeader - + Outline Plan - + Go Backward Reculer - + Go Forward Avancer - + Reload Recharger - + Close Fermer @@ -1213,27 +1323,27 @@ GuiDocViewer - + An error occurred while generating the preview. Une erreur est survenue durant la génération de l'aperçu. - + Copy Copier - + Select All Sélectionner tout - + Select Word Sélectionner le mot - + Select Paragraph Sélectionner le paragraphe @@ -1254,12 +1364,12 @@ GuiEditLabel - + Item Label Étiquette de l'élément - + Label Étiquette @@ -1267,37 +1377,37 @@ GuiItemDetails - + Label Label - + Status État - + Class Classe - + Usage Utilisation - + Characters Signes - + Words Mots - + Paragraphs Paragraphes @@ -1305,27 +1415,27 @@ GuiLipsum - + Insert Placeholder Text Texte de remplissage - + Insert Lorem Ipsum Text Insérer du texte Lorem Ipsum - + Number of paragraphs Nombre de paragraphes - + Randomise order Ordre aléatoire - + Insert Insérer @@ -1333,78 +1443,78 @@ GuiMain - + novelWriter is ready ... novelWriter est prêt ... - + You are now running novelWriter version {0}. Vous utilisez maintenant la version {0} de novelWriter. - + Please check the {0}release notes{1} for further details. Veuillez consulter {0}les notes de version{1} pour plus de détails. - + Close the current project? Fermer le projet en cours ? - - + + Changes are saved automatically. Les changements sont enregistrés automatiquement. - + Backup the current project? Faut-il sauvegarder le projet en cours ? - + The project is already open by another instance of novelWriter, and is therefore locked. Override lock and continue anyway? Ce projet est verrouillé car il est déjà ouvert par une autre instance de novelWriter. Faut-il contourner le verrou et continuer malgré tout ? - + 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. Note : Si le programme ou l'ordinateur s'est bloqué auparavant, le verrou peut être contourné sans problème. Si par contre le projet est actuellement ouvert par une autre instance de novelWriter, contourner le verrou peut corrompre les données du projet. - + The project was locked by the computer '{0}' ({1} {2}), last active on {3}. Le projet a été verrouillé par l'ordinateur '{0}' ({1} {2}), dernière activité à {3}. - + The project index is outdated or broken. Rebuilding index. L'index du projet est périmé ou endommagé. Reconstruction de l'index en cours. - + Import File Importer un fichier - + Could not read file. The file must be an existing text file. Lecture du fichier impossible. Il faut un fichier texte existant. - + Please open a document to import the text file into. Veuillez ouvrir un document dans lequel sera importé le texte. - + Importing the file will overwrite the current content of the document. Do you want to proceed? Le contenu du fichier importé va remplacer le contenu actuel du document. Faut-il continuer ? - + Indexing completed in {0} ms Indexation effectuée en {0} ms @@ -1414,22 +1524,22 @@ L'index du projet a été correctement reconstruit. - + Could not initialise the dialog. Impossible d'initialiser la boîte de dialogue. - + Do you want to exit novelWriter? Voulez-vous sortir de novelWriter ? - + Some changes will not be applied until novelWriter has been restarted. Certains changements ne seront effectifs qu'après un redémarrage de 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}. La référence pour l'étiquette {0} n'a pas été trouvée. Soit elle n'existe pas, soit l'index n'est pas à jour. L'index peut être mis à jour depuis le menu des Outils, ou en appuyant sur {1}. @@ -1573,13 +1683,13 @@ - Go to Project Tree - Aller à l'arborescence + Go to Tree View + - Go to Document Editor - Aller à l'éditeur + Go to Document + @@ -1797,297 +1907,302 @@ Texte de remplissage - + + Footnote + + + + &Format Mise en &forme - + Bold Gras - + Italic Italique - + Strikethrough Barré - + Wrap Double Quotes Guillemets doubles - + Wrap Single Quotes Guillemets simples - + More Formats ... Davantage de formats... - + Bold (Shortcode) Gras (code court) - + Italics (Shortcode) Italiques (code court) - + Strikethrough (Shortcode) Barré (code court) - + Underline Souligné - + Highlight Surligner - + Superscript Exposant - + Subscript Indice - + Heading 1 (Partition) Titre 1 (Partie) - + Heading 2 (Chapter) Titre 2 (Chapitre) - + Heading 3 (Scene) Titre 3 (Scène) - + Heading 4 (Section) Titre 4 (Section) - + Novel Title Titre du roman - + Unnumbered Chapter Chapitre sans numéro - + Alternative Scene Scène alternative - + Align Left Aligner à gauche - + Align Centre Aligner au centre - + Align Right Aligner à droite - + Indent Left Indenter à gauche - + Indent Right Indenter à droite - + Toggle Comment Commentaire - + Toggle Ignore Text Activer/désactiver ignorer le texte - + Remove Block Format Enlever le format du bloc - + Replace Straight Single Quotes Remplacer les guillemets simples droits - + Replace Straight Double Quotes Remplacer les guillemets doubles droits - + Remove In-Paragraph Breaks Retirer les coupures dans le paragraphe - + &Search Rec&herche - + Find Chercher - + Replace Remplacer - + Find Next Chercher en avant - + Find Previous Chercher en arrière - + Replace Next Remplacer le prochain - + Find in Project Rechercher dans le projet - + &Tools &Outils - + Check Spelling Vérifier l'orthographe - + Spell Check Language Langue de vérification orthographique - + Default Valeur par défaut - + Re-Run Spell Check Réeffectuer la vérification orthographique - + Project Word List Lexique du projet - + Add Dictionaries Ajouter des dictionnaires - + Rebuild Index Reconstruire l'index - + Backup Project Sauvegarder le dossier contenant les fichiers du projet - + Build Manuscript Compiler le manuscrit - + Writing Statistics Statistiques d'écriture - + Preferences Préférences - + &Help Aid&e - + About novelWriter À propos de novelWriter - + About Qt5 À propos de Qt5 - + User Manual (Online) Manuel d'utilisation (en ligne) - + User Manual (PDF) Manuel d'utilisation (PDF) - + Report an Issue (GitHub) Signaler un problème (GitHub) - + Ask a Question (GitHub) Poser une question (GitHub) - + The novelWriter Website Site web de novelWriter @@ -2096,22 +2211,22 @@ GuiMainStatus - + None Sans - + Editor Éditeur - + Project Projet - + Session Time Durée de la session @@ -2134,63 +2249,63 @@ GuiManuscript - + Build Manuscript Compiler le manuscrit - + Add New Build Ajouter une nouvelle compilation - + Delete Selected Build Supprimer la compilation sélectionnée - + Edit Selected Build Modifier la compilation sélectionnée - + Builds Compilations - + Details Détails - + Outline Plan - + Preview Aperçu - + Print Imprimer - + Build Construire - + Close Fermer - - + + My Manuscript Mon manuscrit @@ -2256,18 +2371,18 @@ GuiNovelDetails - - + + Novel Details Détails du roman - + Overview Vue d'ensemble - + Contents Contenu @@ -2275,58 +2390,58 @@ GuiNovelToolBar - + Outline of {0} Plan de {0} - + Novel Root Racine du roman - + Refresh Mettre à jour - + Last Column Dernière colonne - + Hidden Caché - + Point of View Character Personnage du point de vue - + Focus Character Personnage central - + Novel Plot Intrigue du roman - - + + Column Size Largeur de colonne - + More Options Autres options - + Maximum column size in % Largeur de colonne max en % @@ -2334,7 +2449,7 @@ GuiNovelTree - + No meta data Pas de métadonnées @@ -2342,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title Titre - + Chapter Chapitre - + Scene Scène - + Section Section - + Document Document - + Status État - + Characters Signes - + Words Mots - + Paragraphs Paragraphes - + Synopsis Synopsis - + Title Details Titre et Détails - + Reference Tags Etiquettes de référence @@ -2407,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns Sélectionner les colonnes @@ -2415,17 +2530,17 @@ GuiOutlineToolBar - + Outline of Plan de - + Refresh Mettre à jour - + Export CSV Exporter en CSV @@ -2433,7 +2548,7 @@ GuiOutlineTree - + Save Outline As Enregistrer le résumé sous @@ -2441,553 +2556,589 @@ GuiPreferences - - + + Preferences Préférences - + Search Chercher - + General Général - + Appearance Apparence - + Display language Langue d'affichage - - - + + Requires restart to take effect. Nécessite un redémarrage pour prendre effet. - + Colour theme Couleur du thème - + General colour theme and icons. Thème de couleur et icônes généraux. - - Application font family - Famille de la police de l'application + + Application font + - - Application font size - Taille de la police de l'application - - - - - pt - pt - - - + Hide vertical scroll bars in main windows Masquer les barres de défilement verticales dans les fenêtres principales - - + + Scrolling available with mouse wheel and keys only. Le défilement ne pourra se faire que par la molette de la souris et les touches du clavier. - + Hide horizontal scroll bars in main windows Masquer les barres de défilement horizontales dans les fenêtres principales + + + Use the system's font selection dialog + + + Turn off to use the Qt font dialog, which may have more options. + + + + Document Style Style du document - + Document colour theme Thème de couleur du document - + Colour theme for the editor and viewer. Thème de couleurs à utiliser dans l'éditeur et l'afficheur. - - Document font family - Famille de la police du document + + Document font + - - - - + + + Applies to both document editor and viewer. S'applique à l'éditeur et à l'afficheur de documents. - - Document font size - Taille de la police du document - - - + Emphasise partition and chapter labels Rehausser les étiquettes de parties et de chapitres - + Makes them stand out in the project tree. Les mettre en évidence dans l'arborescence du projet. - + Show full path in document header Montrer le chemin complet dans l'en-tête du document - + Add the parent folder names to the header. Ajouter les noms des dossiers parents dans l'en-tête. - + Include project notes in status bar word count Inclure les notes du projet dans le compte total de mots - + Auto Save Enregistrement automatique - + Save document interval Intervalle d'enregistrement - + How often the document is automatically saved. À quelle fréquence le document ouvert est automatiquement enregistré. - - + + seconds secondes - + Save project interval Intervalle d'enregistrement du projet - + How often the project is automatically saved. À quelle fréquence le projet ouvert est automatiquement enregistré. - + Project Backup Sauvegarde du projet - + Browse Parcourir - + Backup storage location Emplacement de sauvegarde du projet - - + + Path: {0} Chemin : {0} - + Run backup when the project is closed Sauvegarder à la fermeture du projet - + Can be overridden for individual projects in Project Settings. Peut être invalidé pour des projets spécifiques dans leurs paramètres. - + Ask before running backup Demander avant de sauvegarder - + If off, backups will run in the background. Si désactivé, les sauvegardes seront effectuées en arrière-plan. - + Session Timer Chronomètre de session - + Pause the session timer when not writing Arrêter le chronomètre quand on n'écrit pas - + Also pauses when the application window does not have focus. Arrêter également lorsque la fenêtre de l'application n'a pas le focus. - + Editor inactive time before pausing timer Durée d'inactivité de l'éditeur avant la mise en pause du chronomètre - + User activity includes typing and changing the content. L'activité de l'utilisateur inclut la frappe et la modification du contenu. - + minutes minutes - + Writing Ecriture - + Text Flow Déroulement du texte - + Maximum text width in "Normal Mode" Largeur maximale du texte en mode "normal" - + Set to 0 to disable this feature. Mettre à 0 pour désactiver cette fonctionnalité. - - - - + + + + px px - + Maximum text width in "Focus Mode" Largeur maximale du texte en mode "sans distraction" - + The maximum width cannot be disabled. La largeur maximale ne peut pas être désactivée. - + Hide document footer in "Focus Mode" Masquer le bas de page en mode "sans distraction" - + Hide the information bar in the document editor. Masquer la barre d'informations sous le document. - + Justify the text margins Justifier le texte aux marges - + Minimum text margin Marge minimale de texte - + Tab width Largeur des tabulations - + The width of a tab key press in the editor and viewer. La largeur résultant d'un appui sur la touche de tabulation dans l'éditeur et l'afficheur. - + Text Editing Édition de texte - + Spell check language Langue de vérification orthographique - + Available languages are determined by your system. Les langues disponibles dépendent de votre système. - + Auto-select word under cursor Auto-sélection du mot sous le curseur - + Apply formatting to word under cursor if no selection is made. En l'absence de texte sélectionné la mise en forme s'applique au mot sous le curseur. - + Show tabs and spaces Montrer les tabulations et les espaces - + Show line endings Montrer les fins de lignes - + Editor Scrolling Défilement de l'éditeur - + Scroll past end of the document Le défilement dépasse la fin du document - + Also centres the cursor when scrolling. Centre également le curseur lors du défilement. - + Typewriter style scrolling when you type Défilement de machine à écrire - + Keeps the cursor at a fixed vertical position. L'éditeur essaye de conserver le curseur à la même position verticale. - + Minimum position for Typewriter scrolling Position minimale en mode machine à écrire - + Percentage of the editor height from the top. En pourcentage de la hauteur de la fenêtre depuis le haut. - + Text Highlighting Surlignage du texte - - Highlight text wrapped in quotes - Mettre en évidence le texte situé entre des guillemets + + None + Aucun - - - - Applies to the document editor only. - Ne s'applique qu'à l'éditeur de document. + + Single Quotes + + + + + Double Quotes + + + + + Both + + + + + Highlight dialogue + + + + + Applies to the selected quote styles. + + + + + Allow open-ended dialogue + - Allow open-ended single quotes - Autoriser les guillemets simples non fermés + Highlight dialogue line with no closing quote. + - - Highlight single-quoted line with no closing quote. - Mettre en évidence les lignes avec guillemet simple ouvrant et non fermées. + + Dialogue narrator break symbol + - - Allow open-ended double quotes - Autoriser les guillemets doubles non fermés + + Symbol to indicate injected narrator break. + - - Highlight double-quoted line with no closing quote. - Mettre en évidence les lignes avec guillemet double ouvrant et non fermées. + + Dialogue line symbol + - + + Lines starting with this symbol are dialogue. + + + + + Alternative dialogue symbols + + + + + Custom highlighting of dialogue text. + + + + Add highlight colour to emphasised text Mettre en évidence le texte appuyé - + + + Applies to the document editor only. + Ne s'applique qu'à l'éditeur de document. + + + Highlight multiple or trailing spaces Surligner les espaces multiples ou terminaux - + Text Automation Automatisation de texte - + Auto-replace text as you type Auto-remplacement par la frappe - + Allow the editor to replace symbols as you type. Permet à l'éditeur de remplacer les symboles au fur et à mesure de la frappe. - + Auto-replace single quotes Auto-remplacement des guillemets simples - - + + Try to guess which is an opening or a closing quote. Tenter de deviner si un guillemet est ouvrant ou fermant. - + Auto-replace double quotes Auto-remplacement des guillemets doubles - + Auto-replace dashes Auto-remplacement des tirets - + Double and triple hyphens become short and long dashes. Deux ou trois tirets successifs deviennent des tirets moyens (semi-cadratins) ou longs (cadratins). - + Auto-replace dots Auto-remplacement des points - + Three consecutive dots become ellipsis. Trois points consécutifs deviennent des points de suspension. - + Insert non-breaking space before Espace insécable avant - + Automatically add space before any of these symbols. Ajouter lors de la frappe une espace avant chacun de ces caractères. - + Insert non-breaking space after Espace insécable après - + Automatically add space after any of these symbols. Ajouter lors de la frappe une espace après chacun de ces caractères. - + Use thin space instead Utiliser des espaces fines - + Inserts a thin space instead of a regular space. Insérer une espace fine au lieu d'une espace-mot. - + Quotation Style Style de guillemets - + Single quote open style Guillemets simples ouvrants - + The symbol to use for a leading single quote. Symbole à utiliser pour un guillemet simple ouvrant. - + Single quote close style Guillemets simples fermants - + The symbol to use for a trailing single quote. Symbole à utiliser pour un guillemet simple fermant. - + Double quote open style Guillemets doubles ouvrants - + The symbol to use for a leading double quote. Symbole à utiliser pour un guillemet double ouvrant. - + Double quote close style Guillemets doubles fermants - + The symbol to use for a trailing double quote. Symbole à utiliser pour un guillemet double fermant. - + Backup Directory Répertoire de sauvegarde @@ -3023,28 +3174,28 @@ GuiProjectSettings - - + + Project Settings Paramètres du projet - + Settings Général - + Status État - + Importance Importance - + Auto-Replace Auto-remplacement @@ -3052,47 +3203,47 @@ GuiProjectToolBar - + Project Content Contenu du projet - + Quick Links Liens rapides - + Move Up Déplacer vers le haut - + Move Down Déplacer vers le bas - + Add Item Ajouter un élément - + Expand All Tout développer - + Collapse All Tout replier - + Empty Trash Vider la corbeille - + More Options Autres options @@ -3100,122 +3251,130 @@ GuiProjectTree - + Active Actif - + Inactive Inactif - + Permanently delete {0} file(s) from Trash? Effacer définitivement {0} fichier(s) dans la Corbeille ? - + Did not find anywhere to add the file or folder! Pas trouvé d'emplacement pour y ajouter le fichier ou le dossier ! - + Cannot add new files or folders to the Trash folder. Impossible d'ajouter de nouveaux fichiers ou dossiers dans le dossier Corbeille. - + New Note Nouvelle note - + New Chapter Nouveau chapitre - + New Scene Nouvelle scène - + New Document Nouveau document - + New Folder Nouveau dossier - + There is currently no Trash folder in this project. Il n'existe pas actuellement de dossier Corbeille pour ce projet. - + The Trash folder is already empty. Le dossier Corbeille est déjà vide. - + Move '{0}' to Trash? Déplacer '{0}' dans la corbeille ? - + Root folders can only be deleted when they are empty. Les dossiers racines ne peuvent être supprimés que s'ils sont vides. - + Permanently delete '{0}'? Effacer définitivement '{0} ' ? - + Drag and drop is only allowed for single items, non-root items, or multiple items with the same parent. Le glisser-déposer n'est autorisé que pour des éléments individuels, des éléments non racines, ou des ensembles d'éléments ayant le même parent. - + No documents selected for merging. Aucun document n'a été sélectionné pour la fusion. - + Merged Fusionné - - + + Could not write document content. Impossible d'écrire le contenu du document. - + Do you want to duplicate this document? Voulez-vous dupliquer ce document ? - + Do you want to duplicate this item and all child items? Voulez-vous dupliquer cet élément et tous ceux qu'il contient ? - + Could not duplicate all items. Impossible de dupliquer tous les éléments. - + There is nowhere to add item with name '{0}'. Il n'y a pas d'emplacement pour ajouter l'item nommé '{0}'. + + GuiQuoteSelect + + + Select Quote Style + + + GuiSideBar @@ -3300,33 +3459,33 @@ GuiWordList - - + + Project Word List Lexique du projet - + Import words from text file Importer des mots depuis un fichier texte - + Export words to text file Exporter les mots vers un fichier texte - + Note: The import file must be a plain text file with UTF-8 or ASCII encoding. Note : Le fichier à importer doit être un fichier texte encodé en UTF-8 ou en ASCII. - + Import File Importer un fichier - + Export File Exporter le fichier @@ -3334,147 +3493,147 @@ GuiWritingStats - + Writing Statistics Statistiques d'écriture - + Session Start Début de session - + Length Durée - + Idle Inactif - + Words Mots - + Histogram Histogramme - + Sum Totals Totaux - + Total Time: Temps total : - + Idle Time: Temps d'inactivité : - + Filtered Time: Temps après filtrage : - + Novel Word Count: Compte de mots du texte : - + Notes Word Count: Compte de mot des notes : - + Total Word Count: Compte de mots total : - + Filters Filtres - + Count novel files Compter les fichiers du roman - + Count note files Compter les fichiers de notes - + Hide zero word count Masquer les comptes de mots à zéro - + Hide negative word count Masquer les comptes de mots négatifs - + Group entries by day Regrouper par jour - + Show idle time Montrer le temps d'inactivité - + Word count cap for the histogram Compte de mots maximum dans l'histogramme - + Save As Enregistrer sous - + JSON Data File (.json) Fichier données JSON (.json) - + CSV Data File (.csv) Fichier données CSV (.csv) - + JSON Data File Fichier données JSON - + CSV Data File Fichier données CSV - + Save Data As Enregistrer ces données sous - + {0} file successfully written to: le fichier {0} a été écrit dans : - + Failed to write {0} file. Erreur lors de l'écriture du fichier {0}. @@ -3482,153 +3641,153 @@ NWProject - + Could not delete document file. Impossible de supprimer le fichier du document. - + Not a known project file format. Le format de ce fichier de projet n'est pas reconnu. - + Project file not found. Fichier de projet non trouvé. - + Failed to open project. Échec lors de l'ouverture du projet. - + Unknown Inconnu - + Project file does not appear to be a novelWriterXML file. Ce fichier projet ne semble pas être un fichier novelWriterXML. - + 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}. Format de projet novelWriter inconnu ou non supporté. Ce projet ne peut pas être ouvert avec cette version de novelWriter, il a été enregistré avec novelWriter version {0}. - + Failed to parse project xml. Impossible de décoder le xml du projet. - + 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? Le format de fichier de votre projet est sur le point d'être mis à jour. Si vous continuez, les anciennes versions de novelWriter ne pourront plus ouvrir ce projet. Continuer ? - + 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? Ce projet a été enregistré par une version plus récente de novelWriter, la version {0}. Ceci est la version {1}. Si vous ouvrez quand même ce projet, certaines propriétés ou certains réglages risquent d'être perdus, toutefois le projet dans son ensemble devrait être intact. Voulez-vous quand même ouvrir ce projet ? - + Recovered Récupéré - + Found {0} orphaned file(s) in the project. {1} file(s) were recovered. {0} fichier(s) orphelin(s) trouvé(s) dans le projet, dont {1} récupéré(s). - + Opened Project: {0} Projet ouvert : {0} - + There is no project open. Aucun projet n'est ouvert. - + Failed to save project. Impossible d'enregistrer le projet. - + Saved Project: {0} Projet enregistré : {0} - + Backing up project ... Sauvegarde du projet en cours ... - + Cannot backup project because no project name is set. Please set a Project Name in Project Settings. Il est impossible de sauvegarder le projet car il n'a pas reçu de nom. Veuillez remplir le nom dans les paramètres du projet. - + Could not create backup folder. Il n'a pas été possible de créer le répertoire de sauvegarde. - + Created a backup of your project of size {0}B. Une sauvegarde de votre projet a été créée, de taille {0}B. - + Path: {0} Chemin : {0} - + Could not write backup archive. Il n'a pas été possible d'écrire l'archive de sauvegarde. - + Project backed up to '{0}' Projet sauvegardé dans {0} - - + + New Nouveau - + Note Note - + Draft Brouillon - + Finished Terminé - + Minor Mineur - + Major Majeur - + Main Principal @@ -3644,89 +3803,89 @@ ProjectBuilder - + The target folder is not empty. Please choose another folder. Le dossier de destination n'est pas vide. Veuillez en choisir un autre. - + An error occurred while trying to create the project. Une erreur est survenue lors de la création du projet. - + New Project Nouveau projet - + Title Page Page de titre - + By Par - + Summary of the chapter. Résumé du chapitre. - + Summary of the scene. Résumé de la scène. - + A short description. Une description sommaire. - + Chapter {0} Chapitre {0} - - + + Scene {0} Scène {0} - + Main Plot Intrigue principale - + Protagonist Protagoniste - + Main Location Lieu principal - - + + The target folder already exists. Please choose another folder. Le dossier de destination n'est pas vide. Veuillez en choisir un autre. - + Could not copy project files. Impossible de copier les fichiers du projet. - + Failed to create a new example project. Il n'a pas été possible de créer un nouveau projet d'exemple. - + Failed to create a new example project. Could not find the necessary files. They seem to be missing from this installation. Impossible de créer un nouveau projet d'exemple. Les fichiers nécessaires n'ont pas pu être trouvés. Ils semblent absents de cette installation. @@ -3863,20 +4022,25 @@ SharedData - + novelWriter Project File or Zip File Fichier de projet ou fichier Zip novelWriter - + novelWriter Project File Fichier projet novelWriter - + Open Project Ouvrir un projet + + + Select Font + + VersionInfoWidget @@ -3924,57 +4088,57 @@ _ContentsPage - + Table of Contents Table des matières - + Title Titre - + Words Mots - + Pages Pages - + Page Page - + Progress Progression - + Words per page Mots par page - + First page offset Décalage de la première page - + Chapters on odd pages Chapitres sur les pages impaires - + Untitled Sans titre - + END FIN @@ -3982,32 +4146,32 @@ _DetailsWidget - + Setting Paramètre - + Value Valeur - + Name Nom - + Selection Sélection - + Title Titre - + Hidden Caché @@ -4015,37 +4179,37 @@ _FilterTab - + Included in manuscript Inclus dans le manuscrit - + Excluded from manuscript Exclu du manuscrit - + Always included Toujours inclus - + Always excluded Toujours exclu - + Reset to default Rétablir les valeurs par défaut - + Mark selection as Marquer la sélection comme - + Select Root Folders Sélectionner les dossiers racine @@ -4053,22 +4217,22 @@ _GuiAlert - + Information Information - + Warning Avertissement - + Error Erreur - + Question Question @@ -4076,93 +4240,93 @@ _HeadingsTab - + Hide Cacher - - + + Editing: {0} Modification : {0} - - + + None Aucun - + Title Titre - + Chapter Number Numéro de chapitre - + Chapter Number (Word) Numéro de chapitre (en lettres) - + Chapter Number (Upper Case Roman) Numéro de chapitre (en chiffres romains majuscules) - + Chapter Number (Lower Case Roman) Numéro de chapitre (en chiffres romains minuscules) - + Scene Number (In Chapter) Numéro de scène (dans le chapitre) - + Scene Number (Absolute) Numéro de scène (absolu) - + Point of View Character Personnage du point de vue - + Focus Character Personnage central - + Insert Insérer - + Apply Appliquer - + Additional Styling Styles supplémentaires - - - + + + Centre Centrer - - - + + + Page Break Saut de page @@ -4170,117 +4334,117 @@ _NewProjectForm - + Required Obligatoire - + Optional Optionnel - + Create a fresh project Créer un nouveau projet - + Create an example project Créer un projet d'exemple - + Copy an existing project Copier un projet existant - + Project Name Nom du projet - + Author Auteur - + Project Path Chemin d'accès - + Prefill Project Préremplir le projet - + Set to 0 to only add scenes Mettre à 0 pour n'ajouter que des scènes - + Add {0} chapter documents Ajouter {0} documents de chapitre - + Add {0} scene documents (to each chapter) Ajouter {0} documents de scènes (à chaque chapitre) - + Add a folder for plot notes Ajouter un dossier pour les notes sur l'intrigue - + Add a folder for character notes Ajouter un dossier pour les notes sur les personnages - + Add a folder for location notes Ajouter un dossier pour les notes sur les lieux - + Add example notes to the above Ajouter des exemples de notes à ce qui précède - + Chapters and Scenes Chapitres et scènes - + Project Notes Notes de projet - + Create New Project Créer un nouveau projet - + Select Project Folder Sélectionner le dossier du projet - + Fresh Project Nouveau projet - + Example Project Projet d'exemple - + Template: {0} Modèle : {0} @@ -4288,7 +4452,7 @@ _NewProjectPage - + A project name is required. Un nom de projet est requis. @@ -4296,27 +4460,27 @@ _OpenProjectPage - + The project path is not reachable. Le chemin du projet n'est pas accessible. - + Path Chemin - + Remove '{0}' from the recent projects list? The project files will not be deleted. Retirer '{0}' de la liste des projets récents ? Le fichier projet ne sera pas effacé. - + Open Project Ouvrir un projet - + Remove Project Supprimer le projet @@ -4324,54 +4488,54 @@ _OverviewPage - + Project Projet - - + + Name Nom - + Revisions Révisions - + Editing Time Durée d'édition - - + + Word Count Compteur de mots - + In Novels Dans les romans - + In Notes Dans les Notes - + Selected Novel Roman sélectionné - + Chapters Chapitres - + Scenes Scènes @@ -4379,40 +4543,40 @@ _PreviewWidget - + Press the "Preview" button to generate ... Appuyez sur le bouton "Aperçu" pour générer... - + Processing ... Traitement en cours... - + Done Terminé - - Unknown - Inconnu - - - + Built Compilé + + + No Preview + + _ProjectListModel - + Word Count Compteur de mots - + Last Opened Dernier ouvert @@ -4420,77 +4584,77 @@ _ReplacePage - + Text Auto-Replace for Preview and Build Remplacements automatiques de texte pour l'aperçu et la compilation - + Keyword Mot-clé - + Replace With Remplacer par - + Select item to edit Choisir l'élément à éditer - - Save - Enregistrer + + Apply + Appliquer _SettingsPage - + Project name Nom du projet - + Changing this will affect the backup path. Modifier ceci affectera le chemin de sauvegarde. - + Author(s) Auteur(s) - - + + Only used when building the manuscript. Utilisé uniquement lors de la compilation du manuscrit. - + Project language Langue du projet - + Default Langue par défaut - + Spell check language Langue de vérification orthographique - - + + Overrides main preferences. Remplace les préférences principales. - + Disable backup on close Désactiver la sauvegarde à la fermeture @@ -4498,59 +4662,59 @@ _StatsWidget - - + + Words Mots - - + + Characters Signes, espaces compris - + Words in Headings Mots dans les titres - + Words in Text Mots dans le texte - + Headings Titres - + Paragraphs Paragraphes - + Characters in Headings Signes dans les titres - + Characters in Text Signes dans le texte - + Characters, No Spaces Signes, espaces exclus - + Characters in Headings, No Spaces Signes dans les titres, espaces exclus - + Characters in Text, No Spaces Signes dans le texte, espaces exclus @@ -4558,196 +4722,216 @@ _StatusPage - + Novel Document Status Levels Niveaux d'état du roman - + Project Note Importance Levels Niveaux d'importance pour les notes de projet - - Label - Étiquette - - - - Usage - Utilisation - - - - Select item to edit - Choisir l'élément à éditer - - - - Colour - Couleur - - - - Save - Enregistrer - - - - Select Colour - Choisir la couleur - - - - New Item - Nouvel élément - - - - Cannot delete a status item that is in use. - On ne peut pas retirer un élément tant qu'il est utilisé. - - - + Not in use Inutilisé - + Used once Utilisé une fois - + Used by {0} items Utilisé {0} fois + + + Select Colour + Choisir la couleur + + + + Label + Étiquette + + + + Usage + Utilisation + + + + Select item to edit + Choisir l'élément à éditer + + + + Colour + Couleur + + + + Circles ... + + + + + Bars ... + + + + + Blocks ... + + + + + Shape + + + + + Apply + Appliquer + + + + New Item + Nouvel élément + + + + Cannot delete a status item that is in use. + On ne peut pas retirer un élément tant qu'il est utilisé. + _TreeContextMenu - + Empty Trash Vider la corbeille - + Rename Renommer - + Open Document Ouvrir le document - + View Document Afficher le document - + Create New ... Créer un nouveau... - + Rename to Heading Renommer comme en-tête - + Set Active to ... Définir Actif à ... - + Toggle Active Activer/Désactiver - + Set Status to ... Définir le statut à ... - - + + Manage Labels ... Gérer les étiquettes... - + Set Importance to ... Définir l'Importance à ... - + Transform ... Transformer ... - - - - + + + + Convert to {0} Convertir en {0} - + Merge Child Items into Self Intégrer les éléments enfants - + Merge Child Items into New Créer une fusion des éléments enfants - + Merge Documents in Folder Fusionner les documents du dossier - + Split Document by Headings Découper le document selon les titres - + Expand All Tout développer - + Collapse All Tout replier - + Duplicate Dupliquer - - + + Delete Permanently Supprimer définitivement - - + + Move to Trash Déplacer vers la corbeille - + Move {0} items to Trash? Déplacer {0} élément(s) dans la corbeille ? - + Do you want to convert the folder to a {0}? This action cannot be reversed. Voulez-vous convertir le dossier en {0} ? Cette action est irréversible. @@ -4755,7 +4939,7 @@ _UpdatableMenu - + From Template Depuis le modèle @@ -4763,12 +4947,12 @@ _ViewPanelBackRefs - + Document Document - + First Heading Premier titre @@ -4776,27 +4960,27 @@ _ViewPanelKeyWords - + Tag Étiquette - + Importance Importance - + Document Document - + Heading Titre - + Short Description Description sommaire diff --git a/i18n/nw_it_IT.ts b/i18n/nw_it_IT.ts index 75a4aac5..301049ee 100644 --- a/i18n/nw_it_IT.ts +++ b/i18n/nw_it_IT.ts @@ -4,232 +4,242 @@ Builds - + Document Filters Filtri del documento - + Novel Documents Documenti del romanzo - + Project Notes Note del progetto - + Inactive Documents Documenti inattivi - + Headings Intestazioni - + Partition Format Formato della Partizione - + Chapter Format Formato del Capitolo - + Unnumbered Format Formato non numerato - + Scene Format Formato della Scena - + Alt. Scene Format Formato scena alt. - + Section Format Formato della Sezione - + Text Content Contenuto del testo - + Include Synopsis Includi sinossi - + Include Comments Includi commenti - + Include Keywords Includi parole chiave - + Include Body Text Includi il corpo del testo - + Ignore These Keywords Ignora queste parole chiave - + Insert Content Inserisci il contenuto - + Add Titles for Notes Aggiungi i titoli per le note - + Text Format Formato del testo - - - Font Family - Famiglia dei caratteri - - - - Font Size - Dimensioni dei caratteri - + Text Font + + + + Line Height Altezza della riga - + Text Options Opzioni del testo - + Justify Text Margins Giustifica i margini del testo - + Replace Unicode Characters Sostituisci Caratteri Unicode - + Replace Tabs with Spaces Sostituisci le tabulazioni con gli spazi - - - Page Layout - Impaginazione - - Unit - Unità - - - - Page Size - Dimensioni pagina - - - - Page Width - Larghezza pagina - - - - Page Height - Altezza pagina - - - - Top Margin - Margine superiore - - - - Bottom Margin - Margine inferiore - - - - Left Margin - Margine sinistro - - - - Right Margin - Margine destro - - - - Open Document (.odt) - Apri documento (.odt) - - - - Add Highlight Colours - Aggiungi colori evidenziati - - - - Page Header - Intestazione della pagina - - - - Page Counter Offset - Scostamento del contatore di pagina - - - - First Line Indent - Rientro della prima linea - - - - Markdown (.md) - Markdown (.md) - - - Preserve Hard Line Breaks Conserva le interruzioni di linea + + + Apply Dialogue Highlighting + + + + + First Line Indent + Rientro della prima linea + + + + Enable Indent + + + + + Indent Width + + + + + Indent First Paragraph + + + + + Page Layout + Impaginazione + + + + Unit + Unità + + + + Page Size + Dimensioni pagina + + + + Page Width + Larghezza pagina + + + + Page Height + Altezza pagina + + + + Top Margin + Margine superiore + + + + Bottom Margin + Margine inferiore + + + + Left Margin + Margine sinistro + + + + Right Margin + Margine destro + + Open Document (.odt) + Apri documento (.odt) + + + + Add Highlight Colours + Aggiungi colori evidenziati + + + + Page Header + Intestazione della pagina + + + + Page Counter Offset + Scostamento del contatore di pagina + + + HTML (.html) HTML (.html) - + Add CSS Styles Aggiungi stile CSS - + Preserve Tab Characters Conserva gli spazi di tabulazione @@ -237,72 +247,72 @@ Common - + in the future in futuro - + just now ora - + a minute ago un minuto fa - + {0} minutes ago {0} minuti fa - + an hour ago un ora fa - + {0} hours ago {0} ore fa - + a day ago un giorno fa - + {0} days ago {0} giorni fa - + a week ago una settimana fa - + {0} weeks ago {0} settimane fa - + a month ago un mese fa - + {0} months ago {0} mesi fa - + a year ago un anno fa - + {0} years ago {0} anni fa @@ -310,375 +320,475 @@ Constant - - - + + + None Nessuno - + Novel Romanzo - - + + Plot Trama - - + + Characters Personaggi - - + + Locations Luoghi - - + + Timeline Sequenza temporale - - + + Objects Oggetti - - + + Entities Entità - - - + + + Custom Personalizzato - + Archive Archivio - + Templates Modelli - + Trash Cestino - - + + Novel Document Documento del romanzo - - + + Project Note Nota del progetto - + Root Folder Cartella principale - + Folder Cartella - + Novel Title Page Pagina del titolo del romanzo - + Novel Chapter Capitolo del romanzo - + Novel Scene Scena del romanzo - + Novel Section Sezione del romanzo - + Tag Etichetta - + Point of View Punto di vista - - + + Focus Focus - + Title Titolo - + Level Livello - + Document Documento - + Line Righe - + Chars Caratteri - + Words Parole - + Pars Paragrafi - + POV POV - + Synopsis Sommario - + Open Document (.odt) Documento Aperto (.odt) - + Flat Open Document (.fodt) Apri documento piatto (.fodt) - + novelWriter HTML (.html) novelWriter HTML (.html) - + novelWriter Markup (.txt) novelWriter Markup (.txt) - + Standard Markdown (.md) Standard Markdown (.md) - + Extended Markdown (.md) Extended Markdown (.md) - + JSON + novelWriter HTML (.json) JSON + novelWriter HTML (.json) - + JSON + novelWriter Markup (.json) JSON + novelWriter Markup (.json) + + + Square + + + + + Triangle + + + + + Nabla + + + + + Diamond + + + + + Pentagon + + + + + Hexagon + + + Star + + + + + Pacman + + + + + 1/4 Circle + + + + + Half Circle + + + + + 3/4 Circle + + + + + Full Circle + + + + + 1 Bar + + + + + 2 Bars + + + + + 3 Bars + + + + + 4 Bars + + + + + 1 Block + + + + + 2 Blocks + + + + + 3 Blocks + + + + + 4 Blocks + + + + Text files File di testo - + Markdown files File Markdown - + novelWriter files File di novelWriter - + CSV files File CSV - + All files Tutti i file - + Millimetres Millimetri - + Centimetres Centimetri - + Inches Pollici - + A4 A4 - + A5 A5 - + A6 A6 - + US Legal US Legale - + US Letter US Lettera - + Straight single quotation mark Virgoletta singola diritta - + Straight double quotation mark Virgolette doppie diritte - + Left single quotation mark Virgoletta singola a sinistra - + Right single quotation mark Virgoletta singola a destra - + Single low-9 quotation mark Singola virgoletta bassa 9 - + Single high-reversed-9 quotation mark Singola virgoletta alta inversa-9 - + Left double quotation mark Virgolette doppie a sinistra - + Right double quotation mark Virgolette doppie a destra - + Double low-9 quotation mark Doppie virgolette basse 9 - + Double high-reversed-9 quotation mark Doppie virgolette alte inverse 9 - + Double low-reversed-9 quotation mark Doppie virgolette basse inverse 9 - + Single left-pointing angle quotation mark Virgoletta singola ad angolo sinistro (<) - + Single right-pointing angle quotation mark Virgoletta singola ad angolo destro (>) - + Double left-pointing angle quotation mark Virgolette doppie ad angolo sinistro (<<) - + Double right-pointing angle quotation mark Virgolette doppie ad angolo destro (>>) - + Left corner bracket Staffa angolare sinistra - + Right corner bracket Staffa angolare destra - + Left white corner bracket Staffa angolare bianca sinistra - + Right white corner bracket Staffa angolare bianca destra @@ -704,38 +814,38 @@ GuiBuildSettings - - + + Manuscript Build Settings Impostazioni di creazione del manoscritto - + Name Nome - + Selection Selezione - + Headings Intestazioni - + Content Contenuto - + Format Formato - + Output Risultato @@ -783,7 +893,7 @@ Impossibile elaborare il file del dizionario - + Added: {0} [{1}B] Aggiunto: {0} [{1}B] @@ -791,22 +901,22 @@ GuiDocEditFooter - + Line: {0} ({1}) Riga: {0} ({1}) - + Words: {0} ({1}) Parole: {0} ({1}) - + Words: {0} selected Parole: {0} selezionate - + Status Stato @@ -814,27 +924,27 @@ GuiDocEditHeader - + Toggle Tool Bar Attiva/disattiva la Barra degli strumenti - + Outline Struttura - + Search Cerca - + Toggle Focus Mode Attiva/Disattiva modalità Focus - + Close Chiudi @@ -842,62 +952,62 @@ GuiDocEditSearch - + Search for Ricerca - + Replace with Sostituisci con - + Search Cerca - + Case Sensitive Considera maiuscole/minuscole - + Whole Words Only Solo parole intere - + RegEx Mode Modalità RegEx - + Loop Search Ricerca a ciclo continuo - + Search Next File Cerca nel file successivo - + Preserve Case Non considerare maiuscole/minuscole - + Close Search Chiudi ricerca - + Find in current document Trova nel documento corrente - + Find and replace in current document Trova e sostituisci nel documento corrente @@ -905,122 +1015,122 @@ GuiDocEditor - + Opened Document: {0} Documento aperto: {0} - + This document has been changed outside of novelWriter while it was open. Overwrite the file on disk? Questo documento è stato cambiato al di fuori di novelWriter mentre era aperto. Sovrascrivere il file su disco? - + Could not save document. Impossibile salvare il documento. - + Saved Document: {0} Documento salvato: {0} - + Spell checking requires the package PyEnchant. It does not appear to be installed. Il controllo ortografico richiede il pacchetto PyEnchant. Non sembra essere installato. - + Spell check complete Controllo ortografico completo - + Document Details Dettagli del documento - + Created: {0} Creato: {0} - + Updated: {0} Aggiornato: {0} - + File Location: {0} Posizione del file: {0} - + Set as Document Name Imposta come nome del documento - + Follow Tag Segui i Tag - + Create Note for Tag Crea una nota per il Tag - + Cut Taglia - + Copy Copia - + Paste Incolla - + Select All Seleziona tutto - + Select Word Seleziona parola - + Select Paragraph Seleziona paragrafo - + Spelling Suggestion(s) Suggerimento(i) ortografico(i) - + No Suggestions Nessun suggerimento - + Add Word to Dictionary Aggiungi parola al dizionario - + Please select some text before calling replace quotes. Per favore seleziona del testo prima di chiedere il cambio di virgolette. - + Do you want to create a new project note for the tag '{0}'? Vuoi creare una nuova nota di progetto per il tag '{0}'? @@ -1104,52 +1214,52 @@ GuiDocToolBar - + Markdown Bold Markdown grassetto - + Markdown Italic Markdown corsivo - + Markdown Strikethrough Markdown barrato - + Shortcode Bold Shortcode grassetto - + Shortcode Italic Shortcode corsivo - + Shortcode Strikethrough Shortcode barrato - + Shortcode Underline Shortcode sottolineato - + Shortcode Highlight Evidenziazione - + Shortcode Superscript Shortcode apice - + Shortcode Subscript Shortcode pendice @@ -1157,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel Mostra/Nascondi il Pannello di visualizzazione - + Comments Commenti - + Show Comments Mostra i commenti - + Synopsis Sinossi - + Show Synopsis Comments Mostra i commenti relativi alla sinossi @@ -1185,27 +1295,27 @@ GuiDocViewHeader - + Outline Struttura - + Go Backward Vai Indietro - + Go Forward Vai Avanti - + Reload Ricarica - + Close Chiudi @@ -1213,27 +1323,27 @@ GuiDocViewer - + An error occurred while generating the preview. Si è verificato un errore durante la generazione dell'anteprima. - + Copy Copia - + Select All Seleziona tutto - + Select Word Seleziona parola - + Select Paragraph Seleziona paragrafo @@ -1254,12 +1364,12 @@ GuiEditLabel - + Item Label Etichetta dell'elemento - + Label Etichetta @@ -1267,37 +1377,37 @@ GuiItemDetails - + Label Etichetta - + Status Stato - + Class Classe - + Usage Utilizzo - + Characters Caratteri - + Words Parole - + Paragraphs Paragrafi @@ -1305,27 +1415,27 @@ GuiLipsum - + Insert Placeholder Text Inserisci testo segnaposto - + Insert Lorem Ipsum Text Inserisci testo Lorem Ipsum - + Number of paragraphs Numero dei paragrafi - + Randomise order Ordine casuale - + Insert Inserisci @@ -1333,78 +1443,78 @@ GuiMain - + novelWriter is ready ... novelWriter è pronto... - + You are now running novelWriter version {0}. Stai ora eseguendo la versione {0} di novelWriter. - + Please check the {0}release notes{1} for further details. Per favore controlla le {0}note di rilascio{1} per ulteriori dettagli. - + Close the current project? Chiudere il progetto attuale? - - + + Changes are saved automatically. Le modifiche vengono salvate automaticamente. - + Backup the current project? Eseguire il backup del progetto corrente? - + The project is already open by another instance of novelWriter, and is therefore locked. Override lock and continue anyway? Il progetto è già aperto da un'altra istanza di novelWriter, ed è quindi bloccato. Scavalcare il blocco e continuare comunque? - + 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. Nota: Se il programma o il computer in precedenza si è bloccato, il blocco può essere superato in modo sicuro. Tuttavia, non è consigliabile sovrascrivere se il progetto è aperto in un'altra istanza di novelWriter. Facendolo si potrebbe danneggiare il progetto. - + The project was locked by the computer '{0}' ({1} {2}), last active on {3}. Il progetto è stato bloccato dal computer '{0}' ({1} {2}), ultimo attivo su {3}. - + The project index is outdated or broken. Rebuilding index. L'indice del progetto è obsoleto o rotto. Ricostruzione dell'indice. - + Import File Importa file - + Could not read file. The file must be an existing text file. Impossibile leggere il file. Il file deve essere un file di testo esistente. - + Please open a document to import the text file into. Si prega di aprire un documento in cui importare il file di testo. - + Importing the file will overwrite the current content of the document. Do you want to proceed? L'importazione del file sovrascriverà il contenuto corrente del documento. Vuoi procedere? - + Indexing completed in {0} ms Indicizzazione completata in {0} ms @@ -1414,22 +1524,22 @@ L'indice del progetto è stato ricostruito con successo. - + Could not initialise the dialog. Impossibile inizializzare il dialogo. - + Do you want to exit novelWriter? Vuoi uscire da novelWriter? - + Some changes will not be applied until novelWriter has been restarted. Alcune modifiche non saranno applicate fino al riavvio di 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}. Impossibile trovare il riferimento per il tag '{0}'. O non esiste, o l'indice è obsoleto. L'indice può essere aggiornato dal menu Strumenti, o premendo {1}. @@ -1573,13 +1683,13 @@ - Go to Project Tree - Vai all'albero del progetto + Go to Tree View + - Go to Document Editor - Vai all'editor dei documenti + Go to Document + @@ -1797,297 +1907,302 @@ Testo segnaposto - + + Footnote + + + + &Format &Formato - + Bold Grassetto - + Italic Corsivo - + Strikethrough Barrato - + Wrap Double Quotes Doppie virgolette automatiche - + Wrap Single Quotes Singole virgolette automatiche - + More Formats ... Altri formati ... - + Bold (Shortcode) Grassetto (Shortcode) - + Italics (Shortcode) Corsivi (Shortcode) - + Strikethrough (Shortcode) Barrato (Shortcode) - + Underline Sottolineato - + Highlight Evidenzia - + Superscript Apice - + Subscript Pedice - + Heading 1 (Partition) Titolo 1 (Partizione) - + Heading 2 (Chapter) Titolo 2 (Capitolo) - + Heading 3 (Scene) Titolo 3 (Scena) - + Heading 4 (Section) Titolo 4 (Sezione) - + Novel Title Titolo del romanzo - + Unnumbered Chapter Capitolo non numerato - + Alternative Scene Scena alternativa - + Align Left Allineamento a sinistra - + Align Centre Centrato - + Align Right Allineamento a destra - + Indent Left Rientro a sinistra - + Indent Right Rientro a destra - + Toggle Comment Attiva/Disattiva commento - + Toggle Ignore Text Attiva/disattiva ignora testo - + Remove Block Format Rimuovi il formato blocco - + Replace Straight Single Quotes Sostituisci le singole virgolette dritte - + Replace Straight Double Quotes Sostituisci le doppie virgolette dritte - + Remove In-Paragraph Breaks Rimuovi le interruzioni di paragrafo - + &Search &Cerca - + Find Trova - + Replace Sostituisci - + Find Next Trova successivo - + Find Previous Trova precedente - + Replace Next Sostituisci successivo - + Find in Project Trova nel progetto - + &Tools &Strumenti - + Check Spelling Controllo ortografico - + Spell Check Language Lingua per il controllo ortografico - + Default Predefinito - + Re-Run Spell Check Riavvia il controllo ortografico - + Project Word List Elenco delle parole del progetto - + Add Dictionaries Aggiungi dizionari - + Rebuild Index Ricostruisci l'indice - + Backup Project Crea una copia di backup - + Build Manuscript Compila manoscritto - + Writing Statistics Statistiche di scrittura - + Preferences Preferenze - + &Help &Aiuto - + About novelWriter A proposito di novelWriter - + About Qt5 A proposito di Qt5 - + User Manual (Online) Manuale utente (Online) - + User Manual (PDF) Manuale utente (PDF) - + Report an Issue (GitHub) Segnala un problema (GitHub) - + Ask a Question (GitHub) Fai una domanda (GitHub) - + The novelWriter Website Il sito web di novelWriter @@ -2096,22 +2211,22 @@ GuiMainStatus - + None Nessuno - + Editor Editor - + Project Progetto - + Session Time Durata della sessione @@ -2134,63 +2249,63 @@ GuiManuscript - + Build Manuscript Compila manoscritto - + Add New Build Aggiungi nuova compilazione - + Delete Selected Build Elimina la compilazione selezionata - + Edit Selected Build Modifica la compilazione selezionata - + Builds Compilazioni - + Details Dettagli - + Outline Struttura - + Preview Anteprima - + Print Stampa - + Build Compila - + Close Chiudi - - + + My Manuscript Il mio manoscritto @@ -2256,18 +2371,18 @@ GuiNovelDetails - - + + Novel Details Dettagli del romanzo - + Overview Panoramica - + Contents Contenuti @@ -2275,58 +2390,58 @@ GuiNovelToolBar - + Outline of {0} Schema di {0} - + Novel Root Radice del romanzo - + Refresh Aggiorna - + Last Column Ultima colonna - + Hidden Nascosto - + Point of View Character Personaggio con punto di vista - + Focus Character Personaggio oggetto del focus - + Novel Plot Trama del romanzo - - + + Column Size Dimensione della colonna - + More Options Altre opzioni - + Maximum column size in % Dimensione massima della colonna in % @@ -2334,7 +2449,7 @@ GuiNovelTree - + No meta data Nessun metadato @@ -2342,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title Titolo - + Chapter Capitolo - + Scene Scena - + Section Sezione - + Document Documento - + Status Stato - + Characters Caratteri - + Words Parole - + Paragraphs Paragrafi - + Synopsis Sinossi - + Title Details Dettagli Titolo - + Reference Tags Riferimenti @@ -2407,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns Seleziona colonne @@ -2415,17 +2530,17 @@ GuiOutlineToolBar - + Outline of Struttura di - + Refresh Aggiorna - + Export CSV Esporta in formato CSV @@ -2433,7 +2548,7 @@ GuiOutlineTree - + Save Outline As Salva lo schema come @@ -2441,553 +2556,589 @@ GuiPreferences - - + + Preferences Preferenze - + Search Cerca - + General Generale - + Appearance Aspetto - + Display language Lingua dell'interfaccia - - - + + Requires restart to take effect. Richiede il riavvio per avere effetto. - + Colour theme Tema colore - + General colour theme and icons. Colore del tema generale e icone. - - Application font family - Famiglia di caratteri dell'applicazione + + Application font + - - Application font size - Dimensione dei caratteri dell'applicazione - - - - - pt - pt - - - + Hide vertical scroll bars in main windows Nascondi le barre di scorrimento verticali nelle finestre principali - - + + Scrolling available with mouse wheel and keys only. Scorrimento disponibile solo con la rotellina del mouse e i tasti. - + Hide horizontal scroll bars in main windows Nascondi le barre di scorrimento orizzontali nelle finestre principali + + + Use the system's font selection dialog + + + Turn off to use the Qt font dialog, which may have more options. + + + + Document Style Stile del documento - + Document colour theme Tema colore del documento - + Colour theme for the editor and viewer. Colore del tema per l'editor e il visualizzatore. - - Document font family - Famiglia di caratteri del documento + + Document font + - - - - + + + Applies to both document editor and viewer. Si applica sia all'editor di documenti che al visualizzatore. - - Document font size - Dimensione dei caratteri del documento - - - + Emphasise partition and chapter labels Evidenzia le etichette delle partizioni e dei capitoli - + Makes them stand out in the project tree. Le fa risaltare nell'albero del progetto. - + Show full path in document header Mostra il percorso completo nell'intestazione del documento - + Add the parent folder names to the header. Aggiunge i nomi delle cartelle di livello superiore all'intestazione. - + Include project notes in status bar word count Includi le note del progetto nel conteggio delle parole della barra di stato - + Auto Save Salvataggio automatico - + Save document interval Intervallo di salvataggio del documento - + How often the document is automatically saved. Quante volte il documento viene salvato automaticamente. - - + + seconds secondi - + Save project interval Intervallo di salvataggio del progetto - + How often the project is automatically saved. Quante volte il progetto viene salvato automaticamente. - + Project Backup Backup del progetto - + Browse Sfoglia - + Backup storage location Posizione di archiviazione del backup - - + + Path: {0} Percorso: {0} - + Run backup when the project is closed Esegui il backup quando il progetto è chiuso - + Can be overridden for individual projects in Project Settings. Può essere sovrascritto per singoli progetti nelle Impostazioni del progetto. - + Ask before running backup Chiedi prima di eseguire il backup - + If off, backups will run in the background. Se disattivato, i backup verranno eseguiti in background. - + Session Timer Timer della sessione - + Pause the session timer when not writing Metti in pausa il timer di sessione quando non si scrive - + Also pauses when the application window does not have focus. Inoltre si interrompe quando la finestra dell'applicazione non ha focus. - + Editor inactive time before pausing timer Tempo d'inattività dell'editor prima di mettere in pausa il timer - + User activity includes typing and changing the content. L'attività dell'utente include la digitazione e la modifica del contenuto. - + minutes minuti - + Writing Scrittura - + Text Flow Flusso del testo - + Maximum text width in "Normal Mode" Larghezza massima del testo in "Modalità normale" - + Set to 0 to disable this feature. Impostare a 0 per disabilitare questa funzione. - - - - + + + + px px - + Maximum text width in "Focus Mode" Larghezza massima del testo in "Modalità Focus" - + The maximum width cannot be disabled. La larghezza massima non può essere disabilitata. - + Hide document footer in "Focus Mode" Nascondi piè di pagina del documento in "Modalità Focus" - + Hide the information bar in the document editor. Nascondi la barra delle informazioni nell'editor dei documenti. - + Justify the text margins Giustifica i margini del testo - + Minimum text margin Dimensione minima del margine del testo - + Tab width Larghezza di tabulazione - + The width of a tab key press in the editor and viewer. La larghezza ottenibile con una pressione sul tasto TAB nell'editor e nel visualizzatore. - + Text Editing Modifica del testo - + Spell check language Lingua per il controllo ortografico - + Available languages are determined by your system. Le lingue disponibili sono determinate dal tuo sistema. - + Auto-select word under cursor Seleziona automaticamente la parola sotto il cursore - + Apply formatting to word under cursor if no selection is made. Applica la formattazione alla parola sotto il cursore se non viene effettuata alcuna selezione. - + Show tabs and spaces Mostra tabulazioni e spazi - + Show line endings Mostra terminazioni di riga - + Editor Scrolling Scorrimento dell'editor - + Scroll past end of the document Scorri alla fine del documento - + Also centres the cursor when scrolling. Centra anche il cursore durante lo scorrimento. - + Typewriter style scrolling when you type Scorrimento stile macchina da scrivere quando si digita - + Keeps the cursor at a fixed vertical position. Mantiene il cursore in posizione verticale fissa. - + Minimum position for Typewriter scrolling Posizione minima per lo scorrimento della macchina da scrivere - + Percentage of the editor height from the top. Percentuale dell'altezza dell'editor dall'alto. - + Text Highlighting Evidenziazione del testo - - Highlight text wrapped in quotes - Evidenzia il testo racchiuso tra virgolette + + None + Nessuno - - - - Applies to the document editor only. - Si applica solo all'editor dei documenti. + + Single Quotes + + + + + Double Quotes + + + + + Both + + + + + Highlight dialogue + + + + + Applies to the selected quote styles. + + + + + Allow open-ended dialogue + - Allow open-ended single quotes - Consenti di aprire e chiudere le singole virgolette + Highlight dialogue line with no closing quote. + - - Highlight single-quoted line with no closing quote. - Evidenzia la riga con virgoletta singola senza virgoletta di chiusura. + + Dialogue narrator break symbol + - - Allow open-ended double quotes - Consenti di aprire e chiudere le doppie virgolette + + Symbol to indicate injected narrator break. + - - Highlight double-quoted line with no closing quote. - Evidenzia la riga con virgolette doppie senza virgolette di chiusura. + + Dialogue line symbol + - + + Lines starting with this symbol are dialogue. + + + + + Alternative dialogue symbols + + + + + Custom highlighting of dialogue text. + + + + Add highlight colour to emphasised text Aggiungi un colore per evidenziare ed enfatizzare il testo - + + + Applies to the document editor only. + Si applica solo all'editor dei documenti. + + + Highlight multiple or trailing spaces Evidenzia spazi multipli o finali - + Text Automation Automatismi del testo - + Auto-replace text as you type Sostituisci automaticamente il testo mentre digiti - + Allow the editor to replace symbols as you type. Consenti all'editor di sostituire i simboli durante la digitazione. - + Auto-replace single quotes Sostituisci automaticamente le virgolette singole - - + + Try to guess which is an opening or a closing quote. Prova a indovinare quale sia l'inizio o la fine di una citazione. - + Auto-replace double quotes Sostituisci automaticamente le virgolette doppie - + Auto-replace dashes Sostituisci automaticamente i trattini - + Double and triple hyphens become short and long dashes. I trattini doppi e tripli diventano brevi e lunghi trattini. - + Auto-replace dots Sostituisci automaticamente i puntini - + Three consecutive dots become ellipsis. Tre punti consecutivi diventano puntini di sospensione. - + Insert non-breaking space before Inserisci uno spazio prima di - + Automatically add space before any of these symbols. Aggiungi automaticamente spazio prima di uno di questi simboli. - + Insert non-breaking space after Inserisci uno spazio dopo di - + Automatically add space after any of these symbols. Aggiungi automaticamente uno spazio dopo uno di questi simboli. - + Use thin space instead Usa invece uno spazio sottile - + Inserts a thin space instead of a regular space. Inserisce uno spazio sottile invece di uno spazio regolare. - + Quotation Style Stile delle citazioni - + Single quote open style Singola virgoletta aperta - + The symbol to use for a leading single quote. Il simbolo da usare per una singola virgoletta iniziale. - + Single quote close style Singola virgoletta chiusa - + The symbol to use for a trailing single quote. Il simbolo da usare per una singola virgoletta finale. - + Double quote open style Doppie virgolette aperte - + The symbol to use for a leading double quote. Il simbolo da usare per avere doppie virgolette iniziali. - + Double quote close style Doppie virgolette chiuse - + The symbol to use for a trailing double quote. Il simbolo da usare per avere doppie virgolette finali. - + Backup Directory Percorso di backup @@ -3023,28 +3174,28 @@ GuiProjectSettings - - + + Project Settings Impostazioni del progetto - + Settings Impostazioni - + Status Stato - + Importance Importanza - + Auto-Replace Auto - sostituisci @@ -3052,47 +3203,47 @@ GuiProjectToolBar - + Project Content Contenuto del progetto - + Quick Links Collegamenti rapidi - + Move Up Sposta su - + Move Down Sposta giù - + Add Item Aggiungi elemento - + Expand All Espandi tutto - + Collapse All Collassa tutto - + Empty Trash Svuota il cestino - + More Options Altre opzioni @@ -3100,122 +3251,130 @@ GuiProjectTree - + Active Attivo - + Inactive Inattivo - + Permanently delete {0} file(s) from Trash? Eliminare definitivamente {0} file(s) dal cestino? - + Did not find anywhere to add the file or folder! Non è stato trovato alcun posto dove aggiungere il file o la cartella! - + Cannot add new files or folders to the Trash folder. Impossibile aggiungere nuovi file o cartelle alla cartella Cestino. - + New Note Nuova nota - + New Chapter Nuovo capitolo - + New Scene Nuova scena - + New Document Nuovo documento - + New Folder Nuova cartella - + There is currently no Trash folder in this project. Al momento non c'è una cartella Cestino in questo progetto. - + The Trash folder is already empty. La cartella Cestino è già vuota. - + Move '{0}' to Trash? Spostare '{0}' nel Cestino? - + Root folders can only be deleted when they are empty. Le cartelle radice possono essere eliminate solo quando sono vuote. - + Permanently delete '{0}'? Eliminare definitivamente '{0}'? - + Drag and drop is only allowed for single items, non-root items, or multiple items with the same parent. Il trascinamento è consentito solo per singoli oggetti, oggetti non radice, o più oggetti con lo stesso genitore. - + No documents selected for merging. Nessun documento selezionato per la fusione. - + Merged Uniti - - + + Could not write document content. Impossibile scrivere il contenuto del documento. - + Do you want to duplicate this document? Vuoi duplicare questo documento? - + Do you want to duplicate this item and all child items? Vuoi duplicare questo elemento e tutti gli elementi figli? - + Could not duplicate all items. Impossibile duplicare tutti gli elementi. - + There is nowhere to add item with name '{0}'. Non c'è nessun posto dove aggiungere un elemento con il nome '{0}. + + GuiQuoteSelect + + + Select Quote Style + + + GuiSideBar @@ -3300,33 +3459,33 @@ GuiWordList - - + + Project Word List Elenco delle parole del progetto - + Import words from text file Importa parole da un file di testo - + Export words to text file Esporta le parole in file di testo - + Note: The import file must be a plain text file with UTF-8 or ASCII encoding. Nota: il file da importare deve essere un file di testo semplice con codifica UTF-8 o ASCII. - + Import File Importa file - + Export File Esporta file @@ -3334,147 +3493,147 @@ GuiWritingStats - + Writing Statistics Statistiche di scrittura - + Session Start Avvii di sessione - + Length Durata - + Idle Inattività - + Words Parole - + Histogram Istogramma - + Sum Totals Totalizzazioni - + Total Time: Tempo totale: - + Idle Time: Tempo d'inattività: - + Filtered Time: Tempo filtrato: - + Novel Word Count: Conteggio parole del romanzo: - + Notes Word Count: Conteggio parole delle note: - + Total Word Count: Conteggio parole totali: - + Filters Filtri - + Count novel files Conteggio file del romanzo - + Count note files Conteggio file delle note - + Hide zero word count Nascondi il conteggio parole se a zero - + Hide negative word count Nascondi il conteggio parole se negativo - + Group entries by day Raggruppa le voci per giorno - + Show idle time Mostra tempo d'inattività - + Word count cap for the histogram Max n° di parole per l'istogramma - + Save As Salva come - + JSON Data File (.json) File di dati JSON (.json) - + CSV Data File (.csv) File di dati CSV (.csv) - + JSON Data File File di dati JSON - + CSV Data File File di dati CSV - + Save Data As Salva dati come - + {0} file successfully written to: {0} file scritto correttamente in: - + Failed to write {0} file. Scrittura file {0} non riuscita. @@ -3482,153 +3641,153 @@ NWProject - + Could not delete document file. Impossibile eliminare il file del documento. - + Not a known project file format. Non è un formato conosciuto di file di progetto. - + Project file not found. File di progetto non trovato. - + Failed to open project. Impossibile aprire il progetto. - + Unknown Sconosciuto - + Project file does not appear to be a novelWriterXML file. Il file del progetto non sembra essere un file novelWriterXML. - + 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}. Formato file di progetto di novelWriter sconosciuto o non supportato. Il progetto non può essere aperto da questa versione di novelWriter. Il file è stato salvato con la versione {0} di novelWriter. - + Failed to parse project xml. Impossibile analizzare il progetto xml. - + 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? Il formato del file del tuo progetto sta per essere aggiornato. Scegliendo di procedere, le versioni più vecchie di novelWriter non saranno più in grado di aprire questo progetto. Continuare? - + 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? Questo progetto è stato salvato da una versione più recente di novelWriter, versione {0}. Questa è la versione {1}. Se si continua ad aprire il progetto, alcuni attributi e impostazioni potrebbero non essere preservati, ma il progetto complessivo dovrebbe andare bene. Continuare ad aprire il progetto? - + Recovered Ripristinato - + Found {0} orphaned file(s) in the project. {1} file(s) were recovered. Trovati {0} file orfani nel progetto. {1} file sono stati recuperati ... - + Opened Project: {0} Progetto aperto: {0} - + There is no project open. Non c'è nessun progetto aperto. - + Failed to save project. Salvataggio del progetto non riuscito. - + Saved Project: {0} Progetto salvato: {0} - + Backing up project ... Crea una copia di backup ... - + Cannot backup project because no project name is set. Please set a Project Name in Project Settings. Impossibile eseguire il backup del progetto perché nessun nome del progetto è impostato. Si prega di impostare un nome del progetto nelle impostazioni del progetto. - + Could not create backup folder. Impossibile creare la cartella di backup. - + Created a backup of your project of size {0}B. Creato un backup del progetto di dimensione {0}B. - + Path: {0} Percorso: {0} - + Could not write backup archive. Impossibile scrivere l'archivio di backup. - + Project backed up to '{0}' Eseguito il backup del progetto su '{0}' - - + + New Nuovo - + Note Nota - + Draft Bozza - + Finished Finito - + Minor Minore - + Major Maggiore - + Main Principale @@ -3644,89 +3803,89 @@ ProjectBuilder - + The target folder is not empty. Please choose another folder. La cartella di destinazione non è vuota. Per favore scegli un'altra cartella. - + An error occurred while trying to create the project. Si è verificato un errore durante il tentativo di creare il progetto. - + New Project Nuovo progetto - + Title Page Pagina del titolo - + By Di - + Summary of the chapter. Riassunto del capitolo. - + Summary of the scene. Riassunto della scena. - + A short description. Una breve descrizione. - + Chapter {0} Capitolo {0} - - + + Scene {0} Scena {0} - + Main Plot Trama principale - + Protagonist Protagonista - + Main Location Località principale - - + + The target folder already exists. Please choose another folder. La cartella di destinazione esiste già. Si prega di scegliere un'altra cartella. - + Could not copy project files. Impossibile copiare i file del progetto. - + Failed to create a new example project. Impossibile creare un nuovo progetto di esempio. - + Failed to create a new example project. Could not find the necessary files. They seem to be missing from this installation. Impossibile creare un nuovo progetto di esempio. Impossibile trovare i file necessari. Sembrano mancanti da questa installazione. @@ -3863,20 +4022,25 @@ SharedData - + novelWriter Project File or Zip File File di progetto di novelWriter o file Zip - + novelWriter Project File File di progetto di novelWriter - + Open Project Apri progetto + + + Select Font + + VersionInfoWidget @@ -3924,57 +4088,57 @@ _ContentsPage - + Table of Contents Tavola dei contenuti - + Title Titolo - + Words Parole - + Pages Pagine - + Page Pagina - + Progress Avanzamento - + Words per page Parole per pagina - + First page offset Scostamento prima pagina - + Chapters on odd pages Capitoli su pagine dispari - + Untitled Senza titolo - + END FINE @@ -3982,32 +4146,32 @@ _DetailsWidget - + Setting Impostazioni - + Value Valore - + Name Nome - + Selection Selezione - + Title Titolo - + Hidden Nascosto @@ -4015,37 +4179,37 @@ _FilterTab - + Included in manuscript Incluso nel manoscritto - + Excluded from manuscript Escluso dal manoscritto - + Always included Sempre incluso - + Always excluded Sempre escluso - + Reset to default Ripristina predefinito - + Mark selection as Segna la selezione come - + Select Root Folders Seleziona cartelle radice @@ -4053,22 +4217,22 @@ _GuiAlert - + Information Informazioni - + Warning Attenzione - + Error Errore - + Question Domanda @@ -4076,93 +4240,93 @@ _HeadingsTab - + Hide Nascondi - - + + Editing: {0} Modifiche: {0} - - + + None Nessuno - + Title Titolo - + Chapter Number Numero capitolo - + Chapter Number (Word) Numero capitolo (in lettere) - + Chapter Number (Upper Case Roman) Numero capitolo (numeri romani maiuscoli) - + Chapter Number (Lower Case Roman) Numero capitolo (numeri romani minuscoli) - + Scene Number (In Chapter) Numero scena (nel capitolo) - + Scene Number (Absolute) Numero scena (assoluto) - + Point of View Character Personaggio con punto di vista - + Focus Character Personaggio oggetto del focus - + Insert Inserisci - + Apply Applica - + Additional Styling Elementi di stile supplementari - - - + + + Centre Centro - - - + + + Page Break Interruzione di pagina @@ -4170,117 +4334,117 @@ _NewProjectForm - + Required Necessario - + Optional Facoltativo - + Create a fresh project Crea un nuovo progetto - + Create an example project Crea un progetto di esempio - + Copy an existing project Copia un progetto esistente - + Project Name Nome del progetto - + Author Autore - + Project Path Percorso del progetto - + Prefill Project Tipo di progetto - + Set to 0 to only add scenes Imposta a 0 per aggiungere solo scene - + Add {0} chapter documents Aggiungi {0} capitoli come documenti - + Add {0} scene documents (to each chapter) Aggiungi {0} scene come documenti (a ogni capitolo) - + Add a folder for plot notes Aggiungi una cartella per le note sulla trama - + Add a folder for character notes Aggiungi una cartella per le note sui personaggi - + Add a folder for location notes Aggiungi una cartella per le note sulle località - + Add example notes to the above Aggiungi note di esempio alle precedenti - + Chapters and Scenes Capitoli e scene - + Project Notes Note del progetto - + Create New Project Crea un nuovo progetto - + Select Project Folder Seleziona la cartella del progetto - + Fresh Project Nuovo progetto - + Example Project Progetto di esempio - + Template: {0} Modello: {0} @@ -4288,7 +4452,7 @@ _NewProjectPage - + A project name is required. È richiesto un nome di progetto. @@ -4296,27 +4460,27 @@ _OpenProjectPage - + The project path is not reachable. Il percorso del progetto non è raggiungibile. - + Path Percorso - + Remove '{0}' from the recent projects list? The project files will not be deleted. Rimuovere '{0}' dalla lista dei progetti recenti? I file del progetto non verranno eliminati. - + Open Project Apri il progetto - + Remove Project Rimuovi il progetto @@ -4324,54 +4488,54 @@ _OverviewPage - + Project Progetto - - + + Name Nome - + Revisions Revisioni - + Editing Time Tempo di lavorazione - - + + Word Count Conteggio delle parole - + In Novels nel romanzo - + In Notes nelle note - + Selected Novel Romanzo selezionato - + Chapters Capitoli - + Scenes Scene @@ -4379,40 +4543,40 @@ _PreviewWidget - + Press the "Preview" button to generate ... Premi il tasto "Anteprima" per compilarla ... - + Processing ... In elaborazione ... - + Done Fatto - - Unknown - Sconosciuto - - - + Built Realizzata + + + No Preview + + _ProjectListModel - + Word Count Conteggio delle parole - + Last Opened Ultima apertura @@ -4420,77 +4584,77 @@ _ReplacePage - + Text Auto-Replace for Preview and Build Sostituzione automatica del testo per l'anteprima e la generazione - + Keyword Parola chiave - + Replace With Sostituisci con - + Select item to edit Seleziona elemento da modificare - - Save - Salva + + Apply + Applica _SettingsPage - + Project name Nome del progetto - + Changing this will affect the backup path. Questo cambiamento influirà sul percorso di backup. - + Author(s) Autore(i) - - + + Only used when building the manuscript. Usato solo durante la costruzione del manoscritto. - + Project language Lingua del progetto - + Default Predefinita - + Spell check language Lingua per il controllo ortografico - - + + Overrides main preferences. Sovrascrive i valori predefiniti. - + Disable backup on close Disabilita il backup alla chiusura @@ -4498,59 +4662,59 @@ _StatsWidget - - + + Words Parole - - + + Characters Caratteri - + Words in Headings Parole nelle intestazioni - + Words in Text Parole nel testo - + Headings Intestazioni - + Paragraphs Paragrafi - + Characters in Headings Caratteri nelle intestazioni - + Characters in Text Caratteri nel testo - + Characters, No Spaces Caratteri, esclusi gli spazi - + Characters in Headings, No Spaces Caratteri nelle intestazioni, esclusi gli spazi - + Characters in Text, No Spaces Caratteri nel testo, esclusi gli spazi @@ -4558,196 +4722,216 @@ _StatusPage - + Novel Document Status Levels Livelli di avanzamento dei file del romanzo - + Project Note Importance Levels Livelli d'importanza dei file delle note - - Label - Etichetta - - - - Usage - Utilizzo - - - - Select item to edit - Seleziona elemento da modificare - - - - Colour - Colore - - - - Save - Salva - - - - Select Colour - Seleziona colore - - - - New Item - Nuovo elemento - - - - Cannot delete a status item that is in use. - Impossibile eliminare un elemento di stato in uso. - - - + Not in use Non utilizzato - + Used once Usato una volta - + Used by {0} items Usato da {0} elementi + + + Select Colour + Seleziona colore + + + + Label + Etichetta + + + + Usage + Utilizzo + + + + Select item to edit + Seleziona elemento da modificare + + + + Colour + Colore + + + + Circles ... + + + + + Bars ... + + + + + Blocks ... + + + + + Shape + + + + + Apply + Applica + + + + New Item + Nuovo elemento + + + + Cannot delete a status item that is in use. + Impossibile eliminare un elemento di stato in uso. + _TreeContextMenu - + Empty Trash Svuota il cestino - + Rename Rinomina - + Open Document Apri documento - + View Document Visualizza documento - + Create New ... Crea nuovo ... - + Rename to Heading Rinomina nell'intestazione - + Set Active to ... Imposta attività su ... - + Toggle Active Commuta Attiva/Disattiva - + Set Status to ... Imposta lo stato su ... - - + + Manage Labels ... Gestisci Etichette ... - + Set Importance to ... Imposta l'importanza su ... - + Transform ... Trasforma ... - - - - + + + + Convert to {0} Converti in {0} - + Merge Child Items into Self Fondi elementi figli - + Merge Child Items into New Fondi elementi figli in uno nuovo - + Merge Documents in Folder Fondi i documenti nella cartella - + Split Document by Headings Dividi il documento alle intestazioni - + Expand All Espandi tutto - + Collapse All Collassa tutto - + Duplicate Duplica - - + + Delete Permanently Elimina definitivamente - - + + Move to Trash Sposta nel cestino - + Move {0} items to Trash? Spostare {0} elementi nel cestino? - + Do you want to convert the folder to a {0}? This action cannot be reversed. Vuoi convertire la cartella in un {0}? Questa azione non può essere annullata. @@ -4755,7 +4939,7 @@ _UpdatableMenu - + From Template Dal modello @@ -4763,12 +4947,12 @@ _ViewPanelBackRefs - + Document Documento - + First Heading Prima intestazione @@ -4776,27 +4960,27 @@ _ViewPanelKeyWords - + Tag Etichetta - + Importance Importanza - + Document Documento - + Heading Intestazione - + Short Description Breve descrizione diff --git a/i18n/nw_ja_JP.ts b/i18n/nw_ja_JP.ts index eb51449c..85d0e17f 100644 --- a/i18n/nw_ja_JP.ts +++ b/i18n/nw_ja_JP.ts @@ -4,232 +4,242 @@ Builds - + Document Filters ドキュメントフィルター - + Novel Documents 小説ドキュメント - + Project Notes プロジェクトノート - + Inactive Documents 非アクティブなドキュメント - + Headings 見出し - + Partition Format パーティション書式 - + Chapter Format チャプター書式 - + Unnumbered Format 番号なし書式 - + Scene Format シーン書式 - + Alt. Scene Format 代替シーン書式 - + Section Format セクション書式 - + Text Content テキストコンテンツ - + Include Synopsis あらすじを含める - + Include Comments コメントを含める - + Include Keywords キーワードを含める - + Include Body Text 本文テキストを含める - + Ignore These Keywords これらのキーワードを無視 - + Insert Content コンテンツを挿入 - + Add Titles for Notes ノートにタイトルを追加 - + Text Format テキストの書式 - - - Font Family - フォントファミリー - - - - Font Size - フォントサイズ - + Text Font + + + + Line Height 行の高さ - + Text Options テキストオプション - + Justify Text Margins テキストの余白を揃える - + Replace Unicode Characters Unicode文字を置換 - + Replace Tabs with Spaces タブをスペースで置換 - - - Page Layout - ページレイアウト - - Unit - ユニット - - - - Page Size - ページサイズ - - - - Page Width - ページ幅 - - - - Page Height - ページ高さ - - - - Top Margin - 上マージン - - - - Bottom Margin - 下マージン - - - - Left Margin - 左マージン - - - - Right Margin - 右マージン - - - - Open Document (.odt) - オープンドキュメント (.odt) - - - - Add Highlight Colours - ハイライト色を追加 - - - - Page Header - ページヘッダー - - - - Page Counter Offset - ページカウンターオフセット - - - - First Line Indent - 最初の行のインデント - - - - Markdown (.md) - マークダウン (.md) - - - Preserve Hard Line Breaks ハードラインブレイクを保持 + + + Apply Dialogue Highlighting + + + + + First Line Indent + 最初の行のインデント + + + + Enable Indent + + + + + Indent Width + + + + + Indent First Paragraph + + + + + Page Layout + ページレイアウト + + + + Unit + ユニット + + + + Page Size + ページサイズ + + + + Page Width + ページ幅 + + + + Page Height + ページ高さ + + + + Top Margin + 上マージン + + + + Bottom Margin + 下マージン + + + + Left Margin + 左マージン + + + + Right Margin + 右マージン + + Open Document (.odt) + オープンドキュメント (.odt) + + + + Add Highlight Colours + ハイライト色を追加 + + + + Page Header + ページヘッダー + + + + Page Counter Offset + ページカウンターオフセット + + + HTML (.html) HTML (.html) - + Add CSS Styles CSSスタイルを追加 - + Preserve Tab Characters タブ文字を保持 @@ -237,72 +247,72 @@ Common - + in the future 未来 - + just now 現在 - + a minute ago 1 分前 - + {0} minutes ago {0} 分前 - + an hour ago 1 時間前 - + {0} hours ago {0} 時間前 - + a day ago 1 日前 - + {0} days ago {0} 日前 - + a week ago 1 週間前 - + {0} weeks ago {0} 週間前 - + a month ago 1 ヶ月前 - + {0} months ago {0} ヶ月前 - + a year ago 1 年前 - + {0} years ago {0} 年前 @@ -310,375 +320,475 @@ Constant - - - + + + None なし - + Novel 小説 - - + + Plot プロット - - + + Characters 登場人物 - - + + Locations 場所 - - + + Timeline タイムライン - - + + Objects オブジェクト - - + + Entities エンティティ - - - + + + Custom カスタム - + Archive アーカイブ - + Templates テンプレート - + 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 あらすじ - + Open Document (.odt) オープンドキュメント (.odt) - + Flat Open Document (.fodt) フラットオープンドキュメント (.fodt) - + novelWriter HTML (.html) novelWriter HTML (.html) - + novelWriter Markup (.txt) novelWriterマークアップ (.txt) - + Standard Markdown (.md) 標準マークダウン (.md) - + Extended Markdown (.md) 拡張マークダウン (.md) - + JSON + novelWriter HTML (.json) JSON + novelWriter HTML (.json) - + JSON + novelWriter Markup (.json) JSON + novelWriter マークアップ (.json) + + + Square + + + + + Triangle + + + + + Nabla + + + + + Diamond + + + + + Pentagon + + + + + Hexagon + + + Star + + + + + Pacman + + + + + 1/4 Circle + + + + + Half Circle + + + + + 3/4 Circle + + + + + Full Circle + + + + + 1 Bar + + + + + 2 Bars + + + + + 3 Bars + + + + + 4 Bars + + + + + 1 Block + + + + + 2 Blocks + + + + + 3 Blocks + + + + + 4 Blocks + + + + Text files テキストファイル - + Markdown files マークダウンファイル - + novelWriter files novelWriterファイル - + CSV files CSVファイル - + All files すべてのファイル - + Millimetres ミリメートル - + Centimetres センチメートル - + Inches インチ - + A4 A4 - + A5 A5 - + A6 A6 - + US Legal US リーガル - + US Letter US レター - + 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 右二重鉤括弧 @@ -704,38 +814,38 @@ GuiBuildSettings - - + + Manuscript Build Settings 原稿のビルド設定 - + Name 名前 - + Selection 選択 - + Headings 見出し - + Content コンテンツ - + Format 書式 - + Output アウトプット @@ -783,7 +893,7 @@ 辞書ファイルを処理できませんでした - + Added: {0} [{1}B] 追加: {0} [{1}B] @@ -791,22 +901,22 @@ GuiDocEditFooter - + Line: {0} ({1}) 行: {0} ({1}) - + Words: {0} ({1}) 単語: {0} ({1}) - + Words: {0} selected 単語: {0} 選択済み - + Status ステータス @@ -814,27 +924,27 @@ GuiDocEditHeader - + Toggle Tool Bar ツールバーの切り替え - + Outline アウトライン - + Search 検索 - + Toggle Focus Mode フォーカスモードの切り替え - + Close 閉じる @@ -842,62 +952,62 @@ GuiDocEditSearch - + Search for 検索 - + Replace with 置換候補 - + Search 検索 - + 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 現在のドキュメント内を検索して置き換え @@ -905,122 +1015,122 @@ GuiDocEditor - + Opened Document: {0} 開かれたドキュメント： {0} - + This document has been changed outside of novelWriter while it was open. Overwrite the file on disk? このドキュメントは、開いている間にnovelWriter以外で変更されました。ディスクにファイルを上書きしますか？ - + Could not save document. ドキュメントを保存できませんでした。 - + Saved Document: {0} 保存済みドキュメント: {0} - + Spell checking requires the package PyEnchant. It does not appear to be installed. スペルチェックにはPyEnchantパッケージが必要ですが、インストールされていないようです。 - + Spell check complete スペルチェック完了 - + Document Details ドキュメントの詳細 - + Created: {0} 作成済み: {0} - + Updated: {0} 更新: {0} - + File Location: {0} ファイル場所: {0} - + Set as Document Name ドキュメント名として設定 - + Follow Tag タグをフォロー - + Create Note for 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. 置き換え引用符を呼び出す前にテキストを選択してください。 - + Do you want to create a new project note for the tag '{0}'? タグ '{0}' の新しいプロジェクトノートを作成しますか？ @@ -1104,52 +1214,52 @@ GuiDocToolBar - + Markdown Bold マークダウン 太字 - + Markdown Italic マークダウン 斜体 - + Markdown Strikethrough マークダウン 取り消し線 - + Shortcode Bold ショートコード 太字 - + Shortcode Italic ショートコード 斜体 - + Shortcode Strikethrough ショートコード 取り消し線 - + Shortcode Underline ショートコード 下線 - + Shortcode Highlight ショートコードハイライト - + Shortcode Superscript ショートコード 上付き文字 - + Shortcode Subscript ショートコード 下付き文字 @@ -1157,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel ビューアーパネルの表示/非表示 - + Comments コメント - + Show Comments コメントを表示 - + Synopsis あらすじ - + Show Synopsis Comments あらすじコメントを表示 @@ -1185,27 +1295,27 @@ GuiDocViewHeader - + Outline アウトライン - + Go Backward 戻る - + Go Forward 進む - + Reload リロード - + Close 閉じる @@ -1213,27 +1323,27 @@ GuiDocViewer - + An error occurred while generating the preview. プレビューの生成中にエラーが発生しました。 - + Copy コピー - + Select All すべて選択 - + Select Word 単語を選択 - + Select Paragraph 段落を選択 @@ -1254,12 +1364,12 @@ GuiEditLabel - + Item Label アイテムラベル - + Label ラベル @@ -1267,37 +1377,37 @@ GuiItemDetails - + Label ラベル - + Status ステータス - + Class クラス - + Usage 用途 - + Characters 文字 - + Words 単語 - + Paragraphs 段落 @@ -1305,27 +1415,27 @@ GuiLipsum - + Insert Placeholder Text プレースホルダーテキスト (ダミーテキスト) を挿入 - + Insert Lorem Ipsum Text ロレム・イプサムテキストを挿入 - + Number of paragraphs 段落数 - + Randomise order 順番をランダム化 - + Insert 挿入 @@ -1333,78 +1443,78 @@ GuiMain - + novelWriter is ready ... novelWriterの準備ができました... - + You are now running novelWriter version {0}. novelWriter バージョン {0} を実行しています。 - + Please check the {0}release notes{1} for further details. 詳細については、 {0}リリース ノート{1} を確認してください。 - + Close the current project? 現在のプロジェクトを閉じますか？ - - + + Changes are saved automatically. 変更は自動的に保存されます。 - + Backup the current project? 現在のプロジェクトをバックアップしますか？ - + The project is already open by another instance of novelWriter, and is therefore locked. Override lock and continue anyway? プロジェクトは既に別のnovelWriterのインスタンスによって開かれているためロックされています。無視して続行しますか？ - + 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. 注意: プログラムまたはコンピュータが以前にクラッシュした場合、ロックを無視しても安全に続行することができます。 ただし、novelWriterの別のインスタンスでプロジェクトが開いている場合は、無視して続行することは推奨されません。プロジェクトが破損する可能性があります。 - + The project was locked by the computer '{0}' ({1} {2}), last active on {3}. このプロジェクトは、コンピューター '{0}' ({1} {2}) によってロックされました。最後に有効になったのは {3} です。 - + The project index is outdated or broken. Rebuilding index. プロジェクトインデックスが古くなっているか、破損しています。インデックスを再構築します。 - + Import File ファイルをインポート - + Could not read file. The file must be an existing text file. ファイルを読み込めませんでした。ファイルは既存のテキストファイルである必要があります。 - + Please open a document to import the text file into. テキストファイルをインポートするには、ドキュメントを開いてください。 - + Importing the file will overwrite the current content of the document. Do you want to proceed? ファイルをインポートするとドキュメントの現在の内容が上書きされます。続行しますか？ - + Indexing completed in {0} ms インデックス作成は {0} ミリ秒で完了しました @@ -1414,22 +1524,22 @@ プロジェクト インデックスが正常に再構築されました。 - + Could not initialise the dialog. ダイアログを初期化できませんでした。 - + Do you want to exit novelWriter? novelWriterを終了しますか？ - + Some changes will not be applied until novelWriter has been restarted. いくつかの変更は、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}. タグ '{0}' の参照が見つかりませんでした。タグが存在しないか、インデックスが古いかのどちらかです。インデックスはツールメニューから更新するか、{1} を押して更新することができます。 @@ -1573,13 +1683,13 @@ - Go to Project Tree - プロジェクトツリーへ移動 + Go to Tree View + - Go to Document Editor - ドキュメントエディターへ移動 + Go to Document + @@ -1797,297 +1907,302 @@ プレースホルダーテキスト - + + Footnote + + + + &Format &書式 - + Bold 太字 - + Italic 斜体 - + Strikethrough 取り消し線 - + Wrap Double Quotes ダブルクォートで包む - + Wrap Single Quotes シングルクォートで包む - + More Formats ... より多くのフォーマット... - + Bold (Shortcode) 太字(ショートコード) - + Italics (Shortcode) 斜体 (ショートコード) - + Strikethrough (Shortcode) 取り消し線 (ショートコード) - + Underline 下線 - + Highlight ハイライト - + Superscript 上付き文字 - + Subscript 下付き文字 - + Heading 1 (Partition) 見出し1 (パーティション) - + Heading 2 (Chapter) 見出し2 (チャプター) - + Heading 3 (Scene) 見出し3 (シーン) - + Heading 4 (Section) 見出し4 (セクション) - + Novel Title 小説のタイトル - + Unnumbered Chapter 番号なしチャプター - + Alternative Scene 代替シーン - + Align Left 左揃え - + Align Centre 中央揃え - + Align Right 右揃え - + Indent Left 左側をインデント - + Indent Right 右側をインデント - + Toggle Comment コメントの切り替え - + Toggle Ignore Text 無視テキストの切り替え - + Remove Block Format ブロック形式を削除 - + Replace Straight Single Quotes 直線シングルクォートを置き換え - + Replace Straight Double Quotes 直線ダブルクォートを置換 - + Remove In-Paragraph Breaks 段落内の区切りを削除 - + &Search &検索 - + Find 検索 - + Replace 置き換え - + Find Next 次を検索 - + Find Previous 前を検索 - + Replace Next 次を置換 - + Find in Project プロジェクト内を検索 - + &Tools &ツール - + Check Spelling スペルチェック - + Spell Check Language スペルチェック言語 - + Default 既定 - + Re-Run Spell Check スペルチェックを再実行 - + Project Word List プロジェクト単語リスト - + Add Dictionaries 辞書を追加 - + Rebuild Index インデックスを再構築 - + Backup Project プロジェクトをバックアップ - + Build Manuscript 原稿をビルド - + Writing Statistics 統計の作成 - + Preferences 環境設定 - + &Help &ヘルプ - + About novelWriter novelWriterについて - + About Qt5 Qt5について - + User Manual (Online) ユーザーマニュアル (オンライン) - + User Manual (PDF) ユーザーマニュアル (PDF) - + Report an Issue (GitHub) 問題を報告 (GitHub) - + Ask a Question (GitHub) 質問する (GitHub) - + The novelWriter Website novelWriterのウェブサイト @@ -2096,22 +2211,22 @@ GuiMainStatus - + None なし - + Editor エディター - + Project プロジェクト - + Session Time セッション時間 @@ -2134,63 +2249,63 @@ GuiManuscript - + Build Manuscript 原稿をビルド - + Add New Build 新しいビルドを追加 - + Delete Selected Build 選択したビルドを削除 - + Edit Selected Build 選択したビルドを編集 - + Builds ビルド - + Details 詳細 - + Outline アウトライン - + Preview プレビュー - + Print 印刷 - + Build ビルド - + Close 閉じる - - + + My Manuscript 私の原稿 @@ -2256,18 +2371,18 @@ GuiNovelDetails - - + + Novel Details 小説の詳細 - + Overview 概要 - + Contents 内容 @@ -2275,58 +2390,58 @@ GuiNovelToolBar - + Outline of {0} {0} のアウトライン - + Novel Root 小説のルート - + Refresh 更新 - + Last Column 最後の列 - + Hidden 非表示 - + Point of View Character 視点人物 - + Focus Character 焦点人物 - + Novel Plot 小説のプロット - - + + Column Size 列のサイズ - + More Options その他の設定 - + Maximum column size in % 列の最大サイズ (%) @@ -2334,7 +2449,7 @@ GuiNovelTree - + No meta data メタデータなし @@ -2342,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title タイトル - + Chapter チャプター - + Scene シーン - + Section セクション - + Document ドキュメント - + Status ステータス - + Characters 文字 - + Words 単語 - + Paragraphs 段落 - + Synopsis あらすじ - + Title Details タイトルの詳細 - + Reference Tags 参照タグ @@ -2407,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns 列の選択 @@ -2415,17 +2530,17 @@ GuiOutlineToolBar - + Outline of アウトライン - + Refresh 更新 - + Export CSV CSVを出力 @@ -2433,7 +2548,7 @@ GuiOutlineTree - + Save Outline As アウトラインを名前を付けて保存 @@ -2441,553 +2556,589 @@ GuiPreferences - - + + Preferences 環境設定 - + Search 検索 - + General 一般 - + Appearance 外観 - + Display language 表示言語 - - - + + Requires restart to take effect. 有効にするには再起動が必要です。 - + Colour theme カラーテーマ - + General colour theme and icons. 一般的なカラーテーマとアイコン。 - - Application font family - アプリケーションのフォントファミリー + + Application font + - - Application font size - アプリケーションのフォントサイズ - - - - - pt - pt - - - + Hide vertical scroll bars in main windows メインウィンドウの垂直スクロールバーを非表示 - - + + Scrolling available with mouse wheel and keys only. スクロールはマウスホイールとキーでのみ利用可能です。 - + Hide horizontal scroll bars in main windows メインウィンドウの横スクロールバーを非表示 + + + Use the system's font selection dialog + + + Turn off to use the Qt font dialog, which may have more options. + + + + Document Style ドキュメントスタイル - + Document colour theme ドキュメントのカラーテーマ - + Colour theme for the editor and viewer. エディタとビューアーのカラーテーマ。 - - Document font family - ドキュメントのフォントファミリー + + Document font + - - - - + + + Applies to both document editor and viewer. ドキュメントエディターとビューアーの両方に適用されます。 - - Document font size - ドキュメントのフォントサイズ - - - + Emphasise partition and chapter labels パーティションとチャプターラベルを強調 - + Makes them stand out in the project tree. プロジェクトツリーで目立つようにします。 - + Show full path in document header ドキュメントヘッダーにフルパスを表示 - + Add the parent folder names to the header. 親フォルダ名をヘッダーに追加します。 - + Include project notes in status bar word count ステータスバーの単語数にプロジェクトノートを含める - + Auto Save 自動保存 - + Save document interval ドキュメントの保存間隔 - + How often the document is automatically saved. ドキュメントが自動的に保存される頻度。 - - + + seconds 秒 - + Save project interval プロジェクトの保存間隔 - + How often the project is automatically saved. プロジェクトが自動的に保存される頻度。 - + Project Backup プロジェクトのバックアップ - + Browse ブラウズ - + Backup storage location バックアップストレージの場所 - - + + Path: {0} パス: {0} - + Run backup when the project is closed プロジェクトを閉じたときにバックアップを実行 - + Can be overridden for individual projects in Project Settings. プロジェクト設定で個々のプロジェクトに対して上書きできます。 - + Ask before running backup バックアップを実行する前に確認 - + If off, backups will run in the background. オフの場合、バックアップはバックグラウンドで実行されます。 - + Session Timer セッションタイマー - + Pause the session timer when not writing 書き込んでいない時にセッションタイマーを一時停止 - + Also pauses when the application window does not have focus. また、アプリケーションウィンドウにフォーカスがない場合は一時停止します。 - + Editor inactive time before pausing timer タイマーを一時停止するまでのエディターの非アクティブ時間 - + User activity includes typing and changing the content. ユーザーアクティビティには、入力とコンテンツの変更が含まれます。 - + minutes 分 - + Writing 執筆 - + Text Flow テキストフロー - + Maximum text width in "Normal Mode" "ノーマルモード"でのテキストの最大幅 - + Set to 0 to disable this feature. この機能を無効にするには0に設定してください。 - - - - + + + + px px - + Maximum text width in "Focus Mode" "フォーカスモード"でのテキストの最大幅 - + The maximum width cannot be disabled. 最大幅を無効にすることはできません - + Hide document footer in "Focus Mode" "フォーカスモード"でドキュメントのフッターを非表示 - + Hide the information bar in the document editor. ドキュメントエディターで情報バーを非表示にします。 - + Justify the text margins テキストの余白を揃える - + Minimum text margin テキストの最小マージン - + Tab width タブの幅 - + The width of a tab key press in the editor and viewer. タブキーを押した時のエディターとプレービューでの幅。 - + Text Editing テキスト編集 - + Spell check language スペルチェック言語 - + Available languages are determined by your system. 利用可能な言語はシステムによって決定されます。 - + Auto-select word under cursor カーソルの下にある単語を自動選択 - + Apply formatting to word under cursor if no selection is made. 選択が行われていない場合は、カーソルの下にある単語に書式を適用します。 - + Show tabs and spaces タブとスペースを表示 - + Show line endings 行末を表示 - + Editor Scrolling エディタースクロール - + Scroll past end of the document ドキュメントの最後までスクロール - + Also centres the cursor when scrolling. また、スクロール時にカーソルを中央に移動します。 - + Typewriter style scrolling when you type 入力時にタイプライタースタイルスクロール - + Keeps the cursor at a fixed vertical position. カーソルを固定の垂直位置に維持します。 - + Minimum position for Typewriter scrolling タイプライタースクロールの最小位置 - + Percentage of the editor height from the top. エディタの高さの上からの割合。 - + Text Highlighting テキストのハイライト - - Highlight text wrapped in quotes - 引用符で囲まれたテキストをハイライト + + None + なし - - - - Applies to the document editor only. - ドキュメントエディターにのみ適用されます。 + + Single Quotes + + + + + Double Quotes + + + + + Both + + + + + Highlight dialogue + + + + + Applies to the selected quote styles. + + + + + Allow open-ended dialogue + - Allow open-ended single quotes - 閉じないシングルクォートを許可 + Highlight dialogue line with no closing quote. + - - Highlight single-quoted line with no closing quote. - 終了引用符がないシングルクォートの行をハイライト表示します。 + + Dialogue narrator break symbol + - - Allow open-ended double quotes - 閉じないダブルクォートを許可 + + Symbol to indicate injected narrator break. + - - Highlight double-quoted line with no closing quote. - 終了引用符がないダブルクォートの行をハイライト表示します。 + + Dialogue line symbol + - + + Lines starting with this symbol are dialogue. + + + + + Alternative dialogue symbols + + + + + Custom highlighting of dialogue text. + + + + Add highlight colour to emphasised text 強調テキストにハイライト色を追加 - + + + Applies to the document editor only. + ドキュメントエディターにのみ適用されます。 + + + Highlight multiple or trailing spaces 複数または末尾のスペースをハイライト表示 - + Text Automation テキストの自動化 - + Auto-replace text as you type 入力時にテキストを自動的に置き換え - + Allow the editor to replace symbols as you type. 入力時にエディタが記号を置き換えることを許可します。 - + Auto-replace single quotes シングルクォートの自動置換 - - + + Try to guess which is an opening or a closing quote. 引用符が開始と終了のどちらかを推測する - + Auto-replace double quotes ダブルクォートの自動置換 - + Auto-replace dashes ダッシュの自動置換 - + Double and triple hyphens become short and long dashes. 二重および三重のハイフンはenおよびemダッシュに置き換えらます。 - + Auto-replace dots ドットの自動置換 - + Three consecutive dots become ellipsis. ３つ連続したドットは省略記号に置き換えられます。 - + Insert non-breaking space before ノーブレークスペースを前に挿入 - + Automatically add space before any of these symbols. これらの記号の前にスペースを自動的に追加します。 - + Insert non-breaking space after ノーブレークスペースを後に挿入 - + Automatically add space after any of these symbols. これらの記号の後にスペースを自動的に追加します。 - + Use thin space instead 細いスペースを代わりに使用 - + Inserts a thin space instead of a regular space. 通常のスペースの代わりに細いスペースを挿入します。 - + Quotation Style クォーテーションスタイル - + Single quote open style シングルクォートオープンスタイル - + The symbol to use for a leading single quote. 先頭のシングルクォートに使用する記号です。 - + Single quote close style シングルクォートクローズスタイル - + The symbol to use for a trailing single quote. 末尾のシングルクォートに使用する記号です。 - + Double quote open style ダブルクォートオープンスタイル - + The symbol to use for a leading double quote. 先頭のダブルクォートに使用する記号です。 - + Double quote close style シングルクォートクローズスタイル - + The symbol to use for a trailing double quote. 末尾のダブルクォートに使用する記号です。 - + Backup Directory バックアップディレクトリー @@ -3023,28 +3174,28 @@ GuiProjectSettings - - + + Project Settings プロジェクト設定 - + Settings 設定 - + Status ステータス - + Importance 重要度 - + Auto-Replace 自動置換 @@ -3052,47 +3203,47 @@ GuiProjectToolBar - + Project Content プロジェクトの内容 - + Quick Links クイックリンク - + Move Up 上へ移動 - + Move Down 下へ移動 - + Add Item アイテムを追加 - + Expand All すべて展開 - + Collapse All すべて折りたたむ - + Empty Trash ごみ箱を空にする - + More Options その他の設定 @@ -3100,122 +3251,130 @@ GuiProjectTree - + Active アクティブ - + Inactive 非アクティブ - + Permanently delete {0} file(s) from Trash? ごみ箱から {0} 個のファイルを完全に削除しますか？ - + Did not find anywhere to add the file or folder! ファイルまたはフォルダを追加する場所が見つかりませんでした！ - + Cannot add new files or folders to the Trash folder. ごみ箱フォルダには新しいファイルやフォルダを追加できません。 - + New Note 新規ノート - + New Chapter 新規チャプター - + New Scene 新規シーン - + New Document 新規ドキュメント - + New Folder 新規フォルダー - + There is currently no Trash folder in this project. このプロジェクトには現在ごみ箱フォルダーがありません。 - + The Trash folder is already empty. ごみ箱フォルダーはすでに空です。 - + Move '{0}' to Trash? '{0}' をごみ箱に移動しますか？ - + Root folders can only be deleted when they are empty. ルートフォルダーは空の場合にのみ削除できます。 - + Permanently delete '{0}'? '{0}' を完全に削除しますか？ - + Drag and drop is only allowed for single items, non-root items, or multiple items with the same parent. ドラッグ&ドロップは、単一のアイテム、ルート以外のアイテム、または同じ親を持つ複数のアイテムにのみ使用できます。 - + No documents selected for merging. 結合するドキュメントが選択されていません。 - + Merged 結合された - - + + Could not write document content. ドキュメントの内容を書き込めませんでした。 - + Do you want to duplicate this document? このドキュメントを複製しますか？ - + Do you want to duplicate this item and all child items? このアイテムとすべての子アイテムを複製しますか？ - + Could not duplicate all items. すべてのアイテムを複製できませんでした。 - + There is nowhere to add item with name '{0}'. '{0}' という名前のアイテムを追加する場所がありません。 + + GuiQuoteSelect + + + Select Quote Style + + + GuiSideBar @@ -3300,33 +3459,33 @@ GuiWordList - - + + Project Word List プロジェクト単語リスト - + Import words from text file テキストファイルから単語をインポート - + Export words to text file 単語をテキストファイルにエクスポート - + Note: The import file must be a plain text file with UTF-8 or ASCII encoding. 注: インポート ファイルは、UTF-8 または ASCII エンコーディングのプレーンテキストファイルである必要があります。 - + Import File ファイルをインポート - + Export File ファイルをエクスポート @@ -3334,147 +3493,147 @@ GuiWritingStats - + Writing Statistics 執筆の統計 - + Session Start セッション開始 - + Length 長さ - + Idle アイドル - + Words 単語 - + Histogram ヒストグラム - + Sum Totals 合計 - + Total Time: 合計時間: - + Idle Time: アイドル時間: - + Filtered Time: フィルター時間: - + Novel Word Count: 小説の単語数: - + Notes Word Count: ノートの単語数: - + Total Word Count: 合計単語数: - + Filters フィルター - + Count novel files 小説ファイルをカウント - + Count note files ノートファイルをカウント - + Hide zero word count 単語数0を非表示 - + Hide negative word count 負の単語数を非表示 - + Group entries by day 日毎にグループ化 - + Show idle time アイドル時間の表示 - + Word count cap for the histogram ヒストグラムの単語数上限 - + Save As 名前を付けて保存 - + JSON Data File (.json) JSON データファイル (.json) - + CSV Data File (.csv) CSV データファイル (.csv) - + JSON Data File JSON データファイル - + CSV Data File CSV データファイル - + Save Data As 名前を付けてデータを保存 - + {0} file successfully written to: {0} ファイルの書き込みに成功しました: - + Failed to write {0} file. {0} ファイルの書き込みに失敗しました。 @@ -3482,153 +3641,153 @@ NWProject - + Could not delete document file. ドキュメントファイルを削除できませんでした。 - + Not a known project file format. 既知のプロジェクトファイル形式ではありません。 - + Project file not found. プロジェクトファイルが見つかりません。 - + Failed to open project. プロジェクトを開けませんでした。 - + Unknown 不明 - + Project file does not appear to be a novelWriterXML file. プロジェクトファイルがnovelWriter XMLファイルではないようです。 - + 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}. 不明な、またはサポートされていないnovelWriterプロジェクトファイル形式です。このバージョンのnovelWriterではプロジェクトを開くことはできません。 ファイルは、novelWriterのバージョン {0} で保存されました。 - + Failed to parse project xml. プロジェクトxmlの解析に失敗しました。 - + 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? プロジェクトのファイル形式を更新しようとしています。 続行すると、古いバージョンのnovelWriterはこのプロジェクトを開くことができなくなります。続行しますか？ - + 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? このプロジェクトは、新しいバージョンのnovelWriter、バージョン {0} によって保存されました。 このインスタンスはバージョン {1} です。 プロジェクトを開くと、いくつかの属性や設定は保持されませんが、プロジェクト全体は問題ありません。 プロジェクトを開きますか？ - + Recovered 復元されました - + Found {0} orphaned file(s) in the project. {1} file(s) were recovered. プロジェクト内に孤立している {0} ファイルが見つかりました。 {1} ファイルを復元しました。 - + Opened Project: {0} 開いたプロジェクト: {0} - + There is no project open. プロジェクトが開かれていません。 - + Failed to save project. プロジェクトを保存できませんでした。 - + Saved Project: {0} 保存されたプロジェクト: {0} - + Backing up project ... プロジェクトをバックアップ中... - + Cannot backup project because no project name is set. Please set a Project Name in Project Settings. プロジェクト名が設定されていないため、プロジェクトをバックアップできません。プロジェクト設定でプロジェクト名を設定してください。 - + Could not create backup folder. バックアップフォルダーを作成できませんでした。 - + Created a backup of your project of size {0}B. プロジェクトサイズ {0}Bのバックアップを作成しました。 - + Path: {0} パス: {0} - + Could not write backup archive. バックアップアーカイブを書き込めませんでした。 - + Project backed up to '{0}' プロジェクトはバックアップされました '{0}' - - + + New 新規 - + Note ノート - + Draft 下書き - + Finished 終了 - + Minor マイナー - + Major メジャー - + Main メイン @@ -3644,89 +3803,89 @@ ProjectBuilder - + The target folder is not empty. Please choose another folder. ターゲットフォルダが空ではありません。別のフォルダを選択してください。 - + An error occurred while trying to create the project. プロジェクトの作成中にエラーが発生しました。 - + New Project 新規プロジェクト - + Title Page タイトルページ - + By 作 - + Summary of the chapter. チャプターの概要。 - + Summary of the scene. シーンの概要。 - + A short description. 簡潔な説明。 - + Chapter {0} チャプター {0} - - + + Scene {0} シーン {0} - + Main Plot メインプロット - + Protagonist 主人公 - + Main Location メインの場所 - - + + The target folder already exists. Please choose another folder. ターゲットフォルダは既に存在します。別のフォルダを選択してください。 - + Could not copy project files. プロジェクトファイルをコピーできませんでした。 - + Failed to create a new example project. 新しいサンプルプロジェクトの作成に失敗しました。 - + Failed to create a new example project. Could not find the necessary files. They seem to be missing from this installation. 新しいサンプルプロジェクトの作成に失敗しました。必要なファイルが見つかりませんでした。インストール時に欠落しているようです。 @@ -3863,20 +4022,25 @@ SharedData - + novelWriter Project File or Zip File novelWriterプロジェクトファイルまたはZipファイル - + novelWriter Project File novelWriterプロジェクトファイル - + Open Project プロジェクトを開く + + + Select Font + + VersionInfoWidget @@ -3924,57 +4088,57 @@ _ContentsPage - + Table of Contents 目次 - + Title タイトル - + Words 単語 - + Pages ページ数 - + Page ページ - + Progress 進捗 - + Words per page 1ページあたりの単語 - + First page offset 最初のページオフセット - + Chapters on odd pages 奇数ページ上のチャプター - + Untitled 無題 - + END END @@ -3982,32 +4146,32 @@ _DetailsWidget - + Setting 設定 - + Value 値 - + Name 名前 - + Selection 選択 - + Title タイトル - + Hidden 非表示 @@ -4015,37 +4179,37 @@ _FilterTab - + Included in manuscript 原稿に含む - + Excluded from manuscript 原稿から除外 - + Always included 常に含む - + Always excluded 常に除外 - + Reset to default デフォルトにリセット - + Mark selection as 選択範囲を次としてマーク - + Select Root Folders ルートフォルダーを選択 @@ -4053,22 +4217,22 @@ _GuiAlert - + Information 情報 - + Warning 警告 - + Error エラー - + Question 質問 @@ -4076,93 +4240,93 @@ _HeadingsTab - + Hide 非表示 - - + + Editing: {0} 編集中: {0} - - + + None なし - + Title タイトル - + Chapter Number チャプター番号 - + Chapter Number (Word) チャプター番号 (文章) - + Chapter Number (Upper Case Roman) チャプター番号 (大文字のローマ字) - + Chapter Number (Lower Case Roman) チャプター番号 (小文字のローマ字) - + Scene Number (In Chapter) シーン番号 (チャプター内) - + Scene Number (Absolute) シーン番号 (絶対) - + Point of View Character 視点人物 - + Focus Character 焦点人物 - + Insert 挿入 - + Apply 適用 - + Additional Styling 追加のスタイル - - - + + + Centre 中央 - - - + + + Page Break 改ページ @@ -4170,117 +4334,117 @@ _NewProjectForm - + Required 必須 - + Optional 任意 - + Create a fresh project 新鮮なプロジェクトを作成 - + Create an example project サンプルプロジェクトを作成 - + Copy an existing project 既存のプロジェクトをコピー - + Project Name プロジェクト名 - + Author 著者 - + Project Path プロジェクトパス - + Prefill Project プロジェクトのプリフィル - + Set to 0 to only add scenes シーンのみを追加するには0に設定してください - + Add {0} chapter documents {0} チャプタードキュメントを追加 - + Add {0} scene documents (to each chapter) {0} シーンドキュメントを追加(各チャプターに) - + Add a folder for plot notes プロットノート用のフォルダーを追加 - + Add a folder for character notes 登場人物ノート用のフォルダーを追加 - + Add a folder for location notes 場所ノート用のフォルダーを追加 - + Add example notes to the above 上記にノートの例を追加する - + Chapters and Scenes チャプターとシーン - + Project Notes プロジェクトノート - + Create New Project 新規プロジェクトを作成 - + Select Project Folder プロジェクトフォルダーを選択 - + Fresh Project 新鮮なプロジェクト - + Example Project サンプルプロジェクト - + Template: {0} テンプレート: {0} @@ -4288,7 +4452,7 @@ _NewProjectPage - + A project name is required. プロジェクト名は必須です。 @@ -4296,27 +4460,27 @@ _OpenProjectPage - + The project path is not reachable. プロジェクトパスに到達できません。 - + Path パス - + Remove '{0}' from the recent projects list? The project files will not be deleted. '{0}' を最近のプロジェクトリストから削除しますか？　プロジェクトファイルは削除されません。 - + Open Project プロジェクトを開く - + Remove Project プロジェクトを削除 @@ -4324,54 +4488,54 @@ _OverviewPage - + Project プロジェクト - - + + Name 名前 - + Revisions 修正 - + Editing Time 編集時間 - - + + Word Count 単語カウント - + In Novels 小説内 - + In Notes ノート内 - + Selected Novel 選択した小説 - + Chapters チャプター - + Scenes シーン @@ -4379,40 +4543,40 @@ _PreviewWidget - + Press the "Preview" button to generate ... "プレビュー" ボタンを押して生成します ... - + Processing ... 処理中… - + Done 完了 - - Unknown - 不明 - - - + Built ビルドされた + + + No Preview + + _ProjectListModel - + Word Count 単語カウント - + Last Opened 最後に開いた @@ -4420,77 +4584,77 @@ _ReplacePage - + Text Auto-Replace for Preview and Build プレビューとビルドのためのテキスト自動置換 - + Keyword キーワード - + Replace With 置換候補 - + Select item to edit 編集するアイテムを選択 - - Save - 保存 + + Apply + 適用 _SettingsPage - + Project name プロジェクト名 - + Changing this will affect the backup path. これを変更すると、バックアップパスに影響します。 - + Author(s) 著者 - - + + Only used when building the manuscript. 原稿の作成時にのみ使用されます。 - + Project language プロジェクトの言語 - + Default 既定 - + Spell check language スペルチェック言語 - - + + Overrides main preferences. メイン設定よりも優先されます。 - + Disable backup on close 終了時にバックアップを無効にする @@ -4498,59 +4662,59 @@ _StatsWidget - - + + Words 単語数 - - + + Characters 文字数 - + Words in Headings 見出し内の単語数 - + Words in Text テキスト内の単語数 - + Headings 見出し - + Paragraphs 段落 - + Characters in Headings 見出し内の文字数 - + Characters in Text テキスト内の文字数 - + Characters, No Spaces スペースなし文字数 - + Characters in Headings, No Spaces 見出し内のスペースなし文字数 - + Characters in Text, No Spaces テキスト内のスペースなし文字数 @@ -4558,196 +4722,216 @@ _StatusPage - + Novel Document Status Levels 小説のドキュメントの状態レベル - + Project Note Importance Levels プロジェクトノートの重要度レベル - - Label - ラベル - - - - Usage - 用途 - - - - Select item to edit - 編集するアイテムを選択 - - - - Colour - 色 - - - - Save - 保存 - - - - Select Colour - 色を選択 - - - - New Item - 新規アイテム - - - - Cannot delete a status item that is in use. - 使用中のステータスアイテムは削除できません。 - - - + Not in use 使用されていません - + Used once 一度だけ使用 - + Used by {0} items {0} 個のアイテムで使用 + + + Select Colour + 色を選択 + + + + Label + ラベル + + + + Usage + 用途 + + + + Select item to edit + 編集するアイテムを選択 + + + + Colour + 色 + + + + Circles ... + + + + + Bars ... + + + + + Blocks ... + + + + + Shape + + + + + Apply + 適用 + + + + New Item + 新規アイテム + + + + Cannot delete a status item that is in use. + 使用中のステータスアイテムは削除できません。 + _TreeContextMenu - + Empty Trash ごみ箱を空にする - + Rename 名前を変更 - + Open Document ドキュメントを開く - + View Document ドキュメントを表示 - + Create New ... 新規作成... - + Rename to Heading 見出し名に変更 - + Set Active to ... アクティブに設定... - + Toggle Active アクティブを切り替え - + Set Status to ... ステータスを... に設定 - - + + Manage Labels ... ラベルを管理... - + Set Importance to ... 重要度を... に設定 - + Transform ... 変換... - - - - + + + + Convert to {0} {0} へ変換 - + Merge Child Items into Self 子アイテムを自分に結合 - + Merge Child Items into New 子アイテムを新規アイテムに結合 - + Merge Documents in Folder フォルダ内のドキュメントを結合 - + Split Document by Headings 見出しでドキュメントを分割 - + Expand All すべて展開 - + Collapse All すべて折りたたむ - + Duplicate 複製 - - + + Delete Permanently 完全に削除 - - + + Move to Trash ごみ箱に移動 - + Move {0} items to Trash? {0} アイテムをゴミ箱に移動しますか？ - + Do you want to convert the folder to a {0}? This action cannot be reversed. フォルダーを {0} に変換しますか？　この操作は元に戻せません。 @@ -4755,7 +4939,7 @@ _UpdatableMenu - + From Template テンプレートから @@ -4763,12 +4947,12 @@ _ViewPanelBackRefs - + Document ドキュメント - + First Heading 最初の見出し @@ -4776,27 +4960,27 @@ _ViewPanelKeyWords - + Tag タグ - + Importance 重要度 - + Document ドキュメント - + Heading 見出し - + Short Description 短い説明 diff --git a/i18n/nw_nb_NO.ts b/i18n/nw_nb_NO.ts index df30bf37..4ee4e1e7 100644 --- a/i18n/nw_nb_NO.ts +++ b/i18n/nw_nb_NO.ts @@ -4,232 +4,242 @@ Builds - + Document Filters Dokumentfiltre - + Novel Documents Romandokumenter - + Project Notes Prosjektnotater - + Inactive Documents Inaktive dokumenter - + Headings Overskrifter - + Partition Format Tittelformat - + Chapter Format Kapittelformat - + Unnumbered Format Unummerert format - + Scene Format Sceneformat - + Alt. Scene Format Alt. sceneformat - + Section Format Seksjonformat - + Text Content Tekstinnhold - + Include Synopsis Inkluder sammendrag - + Include Comments Inkluder kommentarer - + Include Keywords Inkluder kodeord - + Include Body Text Inkluder tekst - + Ignore These Keywords Ignorer disse nøkkelordene - + Insert Content Legg til innhold - + Add Titles for Notes Legg til titler for notater - + Text Format Tekstformat - - - Font Family - Skriftfamilie - - - - Font Size - Skriftstørrelse - + Text Font + + + + Line Height Linjehøyde - + Text Options Skriftvalg - + Justify Text Margins Juster tekstmarginer - + Replace Unicode Characters Erstatt unicode-tegn - + Replace Tabs with Spaces Erstatt tabulator med mellomrom - - - Page Layout - Sideoppsett - - Unit - Enhet - - - - Page Size - Sidestørrelse - - - - Page Width - Sidebredde - - - - Page Height - Sidehøyde - - - - Top Margin - Toppmarg - - - - Bottom Margin - Bunnmarg - - - - Left Margin - Venstremarg - - - - Right Margin - Høyremarg - - - - Open Document (.odt) - Open Document (.odt) - - - - Add Highlight Colours - Bruk farger på spesielle elementer - - - - Page Header - Topptekst - - - - Page Counter Offset - Første side for sideteller - - - - First Line Indent - Innrykk på første linje - - - - Markdown (.md) - Markdown (.md) - - - Preserve Hard Line Breaks Bevar harde linjeskift + + + Apply Dialogue Highlighting + + + + + First Line Indent + Innrykk på første linje + + + + Enable Indent + + + + + Indent Width + + + + + Indent First Paragraph + + + + + Page Layout + Sideoppsett + + + + Unit + Enhet + + + + Page Size + Sidestørrelse + + + + Page Width + Sidebredde + + + + Page Height + Sidehøyde + + + + Top Margin + Toppmarg + + + + Bottom Margin + Bunnmarg + + + + Left Margin + Venstremarg + + + + Right Margin + Høyremarg + + Open Document (.odt) + Open Document (.odt) + + + + Add Highlight Colours + Bruk farger på spesielle elementer + + + + Page Header + Topptekst + + + + Page Counter Offset + Første side for sideteller + + + HTML (.html) HTML (.html) - + Add CSS Styles Legg til CSS style - + Preserve Tab Characters Bevar tabulatorer @@ -237,72 +247,72 @@ Common - + in the future i fremtiden - + just now nå nettopp - + a minute ago for et minutt siden - + {0} minutes ago for {0} minutter siden - + an hour ago for en time siden - + {0} hours ago for {0} timer siden - + a day ago for en dag siden - + {0} days ago for {0} dager siden - + a week ago for en uke siden - + {0} weeks ago for {0} uker siden - + a month ago for en måned siden - + {0} months ago for {0} måneder siden - + a year ago for et år siden - + {0} years ago for {0} år siden @@ -310,375 +320,475 @@ Constant - - - + + + None Ingen - + Novel Roman - - + + Plot Plott - - + + Characters Karakterer - - + + Locations Lokasjoner - - + + Timeline Tidslinje - - + + Objects Objekter - - + + Entities Enheter - - - + + + Custom Annet - + Archive Arkiv - + Templates Maler - + Trash Søppel - - + + Novel Document Romandokument - - + + Project Note Prosjektnotat - + Root Folder Hovedmappe - + Folder Mappe - + Novel Title Page Tittelside - + Novel Chapter Kapittel - + Novel Scene Scene - + Novel Section Seksjon - + Tag Knagg - + Point of View Perspektiv - - + + Focus Fokus - + Title Tittel - + Level Nivå - + Document Dokument - + Line Linje - + Chars Tegn - + Words Ord - + Pars Avsnitt - + POV Persp. - + Synopsis Sammendrag - + Open Document (.odt) Open Document (.odt) - + Flat Open Document (.fodt) Flat Open Document (.fodt) - + novelWriter HTML (.html) novelWriter HTML (.htm) - + novelWriter Markup (.txt) novelWriter Markup (.txt) - + Standard Markdown (.md) Standard Markdown (.md) - + Extended Markdown (.md) Utvidet Markdown (.md) - + JSON + novelWriter HTML (.json) JSON + novelWriter HTML (.json) - + JSON + novelWriter Markup (.json) JSON + novelWriter Markup (.json) + + + Square + + + + + Triangle + + + + + Nabla + + + + + Diamond + + + + + Pentagon + + + + + Hexagon + + + Star + + + + + Pacman + + + + + 1/4 Circle + + + + + Half Circle + + + + + 3/4 Circle + + + + + Full Circle + + + + + 1 Bar + + + + + 2 Bars + + + + + 3 Bars + + + + + 4 Bars + + + + + 1 Block + + + + + 2 Blocks + + + + + 3 Blocks + + + + + 4 Blocks + + + + Text files Tekstfiler - + Markdown files Markdown-filer - + novelWriter files novelWriter-filer - + CSV files CSV-filer - + All files Alle filer - + Millimetres Millimeter - + Centimetres Centimeter - + Inches Tommer - + A4 A4 - + A5 A5 - + A6 A6 - + US Legal US Legal - + US Letter US Letter - + Straight single quotation mark Rett, enkelt sitattegn - + Straight double quotation mark Rett, dobbelt sitattegn - + Left single quotation mark Venstre, enkelt sitattegn - + Right single quotation mark Høyre, enkelt sitattegn - + Single low-9 quotation mark Enkelt, lavt-9 sitattegn - + Single high-reversed-9 quotation mark Enkelt, høyt, reversert-9 sitattegn - + Left double quotation mark Venstre, dobbelt sitattegn - + Right double quotation mark Høyre, dobbelt sitattegn - + Double low-9 quotation mark Dobbelt, lavt-9 sitattegn - + Double high-reversed-9 quotation mark Dobbelt, høyt, reversert-9 sitattegn - + Double low-reversed-9 quotation mark Dobbelt, lavt, reversert-9 sitattegn - + Single left-pointing angle quotation mark Enkelt, venstre, angulært sitattegn - + Single right-pointing angle quotation mark Enkelt, høyre, angulært sitattegn - + Double left-pointing angle quotation mark Dobbelt, venstre, angulært sitattegn - + Double right-pointing angle quotation mark Dobbelt, høyre, angulært sitattegn - + Left corner bracket Venstre hjørnevinkel - + Right corner bracket Høyre hjørnevinkel - + Left white corner bracket Venstre, hvit hjørnevinkel - + Right white corner bracket Høyre, hvit hjørnevinkel @@ -704,38 +814,38 @@ GuiBuildSettings - - + + Manuscript Build Settings Byggeinnstillinger for manuskript - + Name Navn - + Selection Utvalg - + Headings Overskrifter - + Content Innhold - + Format Format - + Output Utdata @@ -783,7 +893,7 @@ Kunne ikke behandle ordbokfilen - + Added: {0} [{1}B] Lagt til: {0} [{1}B] @@ -791,22 +901,22 @@ GuiDocEditFooter - + Line: {0} ({1}) Linje: {0} ({1}) - + Words: {0} ({1}) Ord: {0} ({1}) - + Words: {0} selected Ord: {0} valgt - + Status Status @@ -814,27 +924,27 @@ GuiDocEditHeader - + Toggle Tool Bar Vis/skjul verktøylinje - + Outline Disposisjon - + Search Søk - + Toggle Focus Mode Slå av/på "Fokus-modus" - + Close Lukk @@ -842,62 +952,62 @@ GuiDocEditSearch - + Search for Søketekst - + Replace with Erstatt med - + Search Søk - + Case Sensitive Skill store/små bokstaver - + Whole Words Only Kun hele ord - + RegEx Mode RegEx-modus - + Loop Search Søk rundt - + Search Next File Søk i neste file - + Preserve Case Behold store/små bokstaver - + Close Search Lukk søk - + Find in current document Søk i det åpne dokumentet - + Find and replace in current document Søk og erstatt i det åpne dokumentet @@ -905,122 +1015,122 @@ GuiDocEditor - + Opened Document: {0} Åpnet dokument: {0} - + This document has been changed outside of novelWriter while it was open. Overwrite the file on disk? Dette dokumentet er endret utenfor novelWriter mens det var åpent. Overskrive filen på disken? - + Could not save document. Kunne ikke lagre dokumentet. - + Saved Document: {0} Lagret dokument: {0} - + Spell checking requires the package PyEnchant. It does not appear to be installed. Stavekontroll krever at pakken PyEnchant er installert. Det ser det ikke ut til at den er. - + Spell check complete Stavekontrollen er ferdig - + Document Details Dokumentdetaljer - + Created: {0} Opprettet: {0} - + Updated: {0} Oppdatert: {0} - + File Location: {0} Filplassering: {0} - + Set as Document Name Sett som dokumentnavn - + Follow Tag Følg knagg - + Create Note for Tag Opprett notat for knagg - + Cut Klipp - + Copy Kopier - + Paste Lim inn - + Select All Velg hele teksten - + Select Word Velg hele ordet - + Select Paragraph Velg hele avsnittet - + Spelling Suggestion(s) Forslag fra stavekontrollen - + No Suggestions Ingen forslag - + Add Word to Dictionary Legg til ord i ordbok - + Please select some text before calling replace quotes. Venligst velg en del av teksten før du velger å erstatte sitattegn. - + Do you want to create a new project note for the tag '{0}'? Vil du opprette et nytt prosjektnotat for knaggen '{0}'? @@ -1104,52 +1214,52 @@ GuiDocToolBar - + Markdown Bold Fet skrift med Markdown - + Markdown Italic Kursiv med Markdown - + Markdown Strikethrough Gjennomstrek med Markdown - + Shortcode Bold Fet skrift med kortkode - + Shortcode Italic Kursiv med kortkode - + Shortcode Strikethrough Gjennomstrek med kortkode - + Shortcode Underline Understrek med kortkode - + Shortcode Highlight Tekstutheving med kortkode - + Shortcode Superscript Hevet skrift med kortkode - + Shortcode Subscript Senket skrift med kortkode @@ -1157,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel Vis/skjul visningspanelet - + Comments Kommentarer - + Show Comments Vis kommentarer - + Synopsis Sammendrag - + Show Synopsis Comments Vis sammendrag @@ -1185,27 +1295,27 @@ GuiDocViewHeader - + Outline Disposisjon - + Go Backward Gå bakover - + Go Forward Gå fremover - + Reload Oppdater - + Close Lukk @@ -1213,27 +1323,27 @@ GuiDocViewer - + An error occurred while generating the preview. Det har oppstått en feil under genereringen av visningen. - + Copy Kopier - + Select All Velg hele teksten - + Select Word Velg hele ordet - + Select Paragraph Velg hele avsnittet @@ -1254,12 +1364,12 @@ GuiEditLabel - + Item Label Enhetens navn - + Label Navn @@ -1267,37 +1377,37 @@ GuiItemDetails - + Label Navn - + Status Status - + Class Klasse - + Usage Formål - + Characters Tegn - + Words Ord - + Paragraphs Avsnitt @@ -1305,27 +1415,27 @@ GuiLipsum - + Insert Placeholder Text Sett inn midlertidig tekst - + Insert Lorem Ipsum Text Sett inn Lorem Ipsum-tekst - + Number of paragraphs Antall avsnitt - + Randomise order Tilfeldig rekkefølge - + Insert Sett inn @@ -1333,78 +1443,78 @@ GuiMain - + novelWriter is ready ... novelWriter er klar ... - + You are now running novelWriter version {0}. Du kjører nå novelWriter versjon {0}. - + Please check the {0}release notes{1} for further details. Sjekk {0}utgivelsesnotater{1} for mer informasjon. - + Close the current project? Ønsker du å lukke dette prosjektet? - - + + Changes are saved automatically. Endringer lagres automatisk. - + Backup the current project? Ønsker du å ta sikkerhetskopi av dette prosjektet? - + The project is already open by another instance of novelWriter, and is therefore locked. Override lock and continue anyway? Prosjektet er allerede åpent av en annen instans av novelWriter, og er derfor låst. Vil du overstyre denne låsen og fortsette likevel? - + 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. Merk: Hvis programmet eller datamaskinen tidligere krasjet, kan fil-låsen trygt overstyres. Det anbefales imidlertid ikke å overstyre den hvis prosjektet er åpent i en annen instans av novelWriter. Å gjøre det kan skape konflikter i prosjektets filer. - + The project was locked by the computer '{0}' ({1} {2}), last active on {3}. Prosjektet er låst av datamaskinen {0} ({1} {2}), siste registrerte aktivitet var {3}. - + The project index is outdated or broken. Rebuilding index. Prosjektets indeks er utdatert eller skadet. Bygger indeksen på nytt. - + Import File Importer fil - + Could not read file. The file must be an existing text file. Kunne ikke lese filen. Filen må eksistere fra før av. - + Please open a document to import the text file into. Vennligst åpne et dokument hvor teksten i filen kan importeres. - + Importing the file will overwrite the current content of the document. Do you want to proceed? Å importere filen vil overskrive all eksisterende tekst i dokumentet. Ønsker du å fortsette? - + Indexing completed in {0} ms Indekseringen tok {0} ms @@ -1414,22 +1524,22 @@ Prosjektets indeks har blitt bygget på nytt. - + Could not initialise the dialog. Kunne ikke initialisere dialogen. - + Do you want to exit novelWriter? Ønsker du å avslutte novelWriter? - + Some changes will not be applied until novelWriter has been restarted. Noen endringer vil ikke tas i bruk før neste gang novelWriter startes. - + 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}. Kunne ikke finne referansen til knagg {0}. Enten finnes den ikke, eller så er prosjektets indeks ikke oppdatert. Indeksen kan oppdateres fra Verktøy-menyen eller ved å trykke på {1}. @@ -1573,13 +1683,13 @@ - Go to Project Tree - Gå til prosjekt-tre + Go to Tree View + - Go to Document Editor - Gå til dokument-editor + Go to Document + @@ -1797,297 +1907,302 @@ Midlertidig tekst - + + Footnote + + + + &Format &Formattering - + Bold Fet - + Italic Kursiv - + Strikethrough Gjennomstrek - + Wrap Double Quotes Sett i doble sitattegn - + Wrap Single Quotes Sett i enkle sitattegn - + More Formats ... Flere formater ... - + Bold (Shortcode) Fet (kortkode) - + Italics (Shortcode) Kursiv (kortkode) - + Strikethrough (Shortcode) Gjennomstrek (Kortkode) - + Underline Understrek - + Highlight Tekstutheving - + Superscript Hevet skrift - + Subscript Senket skrift - + Heading 1 (Partition) Overskrift 1 (inndeling) - + Heading 2 (Chapter) Overskrift 2 (kapittel) - + Heading 3 (Scene) Overskrift 3 (scene) - + Heading 4 (Section) Overskrift 4 (seksjon) - + Novel Title Boktittel - + Unnumbered Chapter Unumrert kapittel - + Alternative Scene Alternativ scene - + Align Left Venstrejuster - + Align Centre Sentrer - + Align Right Høyrejuster - + Indent Left Innrykk fra venstre - + Indent Right Innrykk fra høyre - + Toggle Comment Veksle kommentar - + Toggle Ignore Text Aktiver/deaktiver ignorert tekst - + Remove Block Format Fjern formattering - + Replace Straight Single Quotes Erstatt enkle sitattegn - + Replace Straight Double Quotes Erstatt doble sitattegn - + Remove In-Paragraph Breaks Fjern linjeskift i avsnittet - + &Search &Søk - + Find Søk - + Replace Erstatt - + Find Next Finn neste - + Find Previous Finn forrige - + Replace Next Erstatt neste - + Find in Project Søk i prosjektet - + &Tools &Verktøy - + Check Spelling Stavekontroll - + Spell Check Language Språk for stavekontroll - + Default Ingen valg - + Re-Run Spell Check Kjør stavekontroll - + Project Word List Prosjektets ordliste - + Add Dictionaries Legg til ordbøker - + Rebuild Index Bygg indeks - + Backup Project Lag sikkerhetskopi av prosjektets mappe - + Build Manuscript Bygg manuskript - + Writing Statistics Statistikk - + Preferences Innstillinger - + &Help &Hjelp - + About novelWriter Om novelWriter - + About Qt5 Om Qt5 - + User Manual (Online) Brukermanual (på nett) - + User Manual (PDF) Brukermanual (PDF) - + Report an Issue (GitHub) Rapporter en feil (GitHub) - + Ask a Question (GitHub) Still et spørsmål (GitHub) - + The novelWriter Website novelWriters nettside @@ -2096,22 +2211,22 @@ GuiMainStatus - + None Ingen - + Editor Editor - + Project Prosjekt - + Session Time Tid brukt i gjeldende sesjon @@ -2134,63 +2249,63 @@ GuiManuscript - + Build Manuscript Bygg manuskript - + Add New Build Legg til ny byggedefinisjon - + Delete Selected Build Slett valgte byggedefinisjon - + Edit Selected Build Rediger valgte byggedefinisjon - + Builds Byggedefinisjoner - + Details Detaljer - + Outline Disposisjon - + Preview Forhåndsvis - + Print Skriv ut - + Build Bygg - + Close Lukk - - + + My Manuscript Mitt manuskript @@ -2256,18 +2371,18 @@ GuiNovelDetails - - + + Novel Details Roman-detaljer - + Overview Oversikt - + Contents Innhold @@ -2275,58 +2390,58 @@ GuiNovelToolBar - + Outline of {0} Innhold i {0} - + Novel Root Roman-mappe - + Refresh Oppdatér - + Last Column Siste kolonne - + Hidden Skjult - + Point of View Character Synsvinkel-karakter - + Focus Character Fokus-karakter - + Novel Plot Roman-plott - - + + Column Size Kolonnebredde - + More Options Flere valg - + Maximum column size in % Maksimal kolonnebredde i % @@ -2334,7 +2449,7 @@ GuiNovelTree - + No meta data Ingen meta-data @@ -2342,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title Tittel - + Chapter Kapittel - + Scene Scene - + Section Seksjon - + Document Dokument - + Status Status - + Characters Tegn - + Words Ord - + Paragraphs Avsnitt - + Synopsis Sammendrag - + Title Details Oversikt - + Reference Tags Referanser @@ -2407,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns Velg kolonner @@ -2415,17 +2530,17 @@ GuiOutlineToolBar - + Outline of Disposisjon for - + Refresh Oppdatér - + Export CSV Eksporter CSV @@ -2433,7 +2548,7 @@ GuiOutlineTree - + Save Outline As Lagre disposisjon som @@ -2441,553 +2556,589 @@ GuiPreferences - - + + Preferences Innstillinger - + Search Søk - + General Generelt - + Appearance Utseende - + Display language Visningspråk - - - + + Requires restart to take effect. Krever omstart for å tre i kraft. - + Colour theme Fargetema - + General colour theme and icons. Generelt fargetema og ikoner. - - Application font family - Skriftfamilie for program + + Application font + - - Application font size - Skriftstørrelse for program - - - - - pt - pt - - - + Hide vertical scroll bars in main windows Skjul vertikale rullefelt i hovedvinduer - - + + Scrolling available with mouse wheel and keys only. Rulling kan bare gjøres med mus og tastatur. - + Hide horizontal scroll bars in main windows Skjul horisontale rullefelt i hovedvinduer + + + Use the system's font selection dialog + + + Turn off to use the Qt font dialog, which may have more options. + + + + Document Style Dokumentets stil - + Document colour theme Dokumentets fargetema - + Colour theme for the editor and viewer. Fargetema for redigering og visning. - - Document font family - Dokumentets skriftfamilie + + Document font + - - - - + + + Applies to both document editor and viewer. Gjelder både redigerings- og visningsvindu. - - Document font size - Dokumentets skriftstørrelse - - - + Emphasise partition and chapter labels Fremhev filnavn for inndeling og kapitler - + Makes them stand out in the project tree. Får dem til å skille seg ut i prosjekttreet. - + Show full path in document header Vis full prosjektbane i dokumenthoder - + Add the parent folder names to the header. Legger til mappene foran dokumentets navn. - + Include project notes in status bar word count Inkluder prosjektnotater i antallet ord i statuslinjen - + Auto Save Automatisk lagring - + Save document interval Intervall for lagring av dokument - + How often the document is automatically saved. Hvor ofte dokumentet lagres automatisk. - - + + seconds sekunder - + Save project interval Intervall for lagring av prosjekt - + How often the project is automatically saved. Hvor ofte prosjektet lagres automatisk. - + Project Backup Sikkerhetskopi - + Browse Bla - + Backup storage location Filbane for sikkerhetskopi - - + + Path: {0} Filbane: {0} - + Run backup when the project is closed Lag sikkerhetskopi når prosjektet lukkes - + Can be overridden for individual projects in Project Settings. Kan overstyres fra individuelle prosjektinnstillinger. - + Ask before running backup Spør før sikkerhetskopi tas - + If off, backups will run in the background. Hvis avslått, tas sikkerhetskopi automatisk. - + Session Timer Sesjons-klokke - + Pause the session timer when not writing Sett klokka på pause når du er inaktiv - + Also pauses when the application window does not have focus. Pauses også når du ikke jobber i applikasjonens vindu. - + Editor inactive time before pausing timer Tid uten skriving før klokka settes på pause - + User activity includes typing and changing the content. Dette måler kun endringer i teksteditoren. - + minutes minutter - + Writing Skriving - + Text Flow Tekstflyt - + Maximum text width in "Normal Mode" Maks tekstbredde i "Normal-modus" - + Set to 0 to disable this feature. Sett til 0 for å deaktivere denne funksjonen. - - - - + + + + px px - + Maximum text width in "Focus Mode" Maks tekstbredde i "Fokus-modus" - + The maximum width cannot be disabled. Denne maks-bredden kan ikke deaktiveres. - + Hide document footer in "Focus Mode" Gjem dokumentets bunnlinje i "Fokus-modus" - + Hide the information bar in the document editor. Skjul informasjonslinjen i dokumenteditoren. - + Justify the text margins Juster tekstmarginer - + Minimum text margin Minimum tekstmargin - + Tab width Tabulatorens bredde - + The width of a tab key press in the editor and viewer. Hvor langt tabulatoren hopper i editor og visning. - + Text Editing Redigering av tekst - + Spell check language Språk for stavekontroll - + Available languages are determined by your system. Tilgjengelige språk hentes fra operativystemet ditt. - + Auto-select word under cursor Auto-velg ord under markør - + Apply formatting to word under cursor if no selection is made. Hvis ingen tekst er valgt, formatter ordet hvor markøren står. - + Show tabs and spaces Synlige tabulatorer og mellomrom - + Show line endings Synlige linjeender - + Editor Scrolling Tekstbehandler rulling - + Scroll past end of the document Tillat å rulle forbi slutten av dokumentet - + Also centres the cursor when scrolling. Sentrerer også markøren når man ruller. - + Typewriter style scrolling when you type Skrivemaskin-liknende rulling mens du skriver - + Keeps the cursor at a fixed vertical position. Holder markøren på samme sted vertikalt. - + Minimum position for Typewriter scrolling Minste avstand for skrivemaskin-rulling - + Percentage of the editor height from the top. I prosent fra toppen av editor-vinduet. - + Text Highlighting Fremheving - - Highlight text wrapped in quotes - Fremhev tekst mellom sitattegn + + None + Ingen - - - - Applies to the document editor only. - Gjelder bare for redigeringsvindu. + + Single Quotes + + + + + Double Quotes + + + + + Both + + + + + Highlight dialogue + + + + + Applies to the selected quote styles. + + + + + Allow open-ended dialogue + - Allow open-ended single quotes - Tillat enkle sitattegn som ikke lukkes + Highlight dialogue line with no closing quote. + - - Highlight single-quoted line with no closing quote. - Fremhev sitater som ikke er lukket i samme avsnitt. + + Dialogue narrator break symbol + - - Allow open-ended double quotes - Tillat doble sitattegn som ikke lukkes + + Symbol to indicate injected narrator break. + - - Highlight double-quoted line with no closing quote. - Fremhev sitater som ikke er lukket i samme avsnitt. + + Dialogue line symbol + - + + Lines starting with this symbol are dialogue. + + + + + Alternative dialogue symbols + + + + + Custom highlighting of dialogue text. + + + + Add highlight colour to emphasised text Fremhev formattert tekst - + + + Applies to the document editor only. + Gjelder bare for redigeringsvindu. + + + Highlight multiple or trailing spaces Fremhev flere eller etterfølgende mellomrom - + Text Automation Tekstautomatisering - + Auto-replace text as you type Erstatt mens du skriver - + Allow the editor to replace symbols as you type. Erstatt symboler mens du skriver. - + Auto-replace single quotes Erstatt enkle sitattegn - - + + Try to guess which is an opening or a closing quote. Prøv å gjette om det er et åpne- eller lukketegn. - + Auto-replace double quotes Erstatt doble sitattegn - + Auto-replace dashes Erstatt bindestreker - + Double and triple hyphens become short and long dashes. To og tre bindestreker erstattes med kort og lang bindestrek. - + Auto-replace dots Erstatt tre punktum - + Three consecutive dots become ellipsis. Tre punktum på rad erstattes med ellipsis. - + Insert non-breaking space before Sett inn hardt mellomrom foran - + Automatically add space before any of these symbols. Legg til mellomrom automatisk foran disse tegnene. - + Insert non-breaking space after Sett inn hardt mellomrom etter - + Automatically add space after any of these symbols. Legg til mellomrom automatisk etter disse tegnene. - + Use thin space instead Bruk tynt mellomrom istedet - + Inserts a thin space instead of a regular space. Sett inn et tynt mellomrom istedenfor et vanlig et. - + Quotation Style Sitattegn - + Single quote open style Enkelt sitat, venstre side - + The symbol to use for a leading single quote. Symbol for enkelt sitattegn før et sitat. - + Single quote close style Enkelt sitat, høyre side - + The symbol to use for a trailing single quote. Symbol for enkelt sitattegn etter et sitat. - + Double quote open style Dobbelt sitat, venstre side - + The symbol to use for a leading double quote. Symbol for dobbelt sitattegn før et sitat. - + Double quote close style Dobbelt sitat, høyre side - + The symbol to use for a trailing double quote. Symbol for dobbelt sitattegn etter et sitat. - + Backup Directory Mappe for sikkerhetskopi @@ -3023,28 +3174,28 @@ GuiProjectSettings - - + + Project Settings Prosjektinnstillinger - + Settings Innstillinger - + Status Status - + Importance Viktighet - + Auto-Replace Autoerstatt @@ -3052,47 +3203,47 @@ GuiProjectToolBar - + Project Content Prosjektets innhold - + Quick Links Hurtiglenker - + Move Up Flytt opp - + Move Down Flytt ned - + Add Item Legg til element - + Expand All Utvid alle - + Collapse All Lukk alle - + Empty Trash Tøm papirkurven - + More Options Flere valg @@ -3100,122 +3251,130 @@ GuiProjectTree - + Active Aktiv - + Inactive Inaktiv - + Permanently delete {0} file(s) from Trash? Vil du slette {0} filer i papirkurven for godt? - + Did not find anywhere to add the file or folder! Fant ikke noe sted å legge til filen eller mappen! - + Cannot add new files or folders to the Trash folder. Kan ikke legge til nye filer eller mapper i papirkurvmappen. - + New Note Nytt notat - + New Chapter Nytt kapittel - + New Scene Ny scene - + New Document Nytt dokument - + New Folder Ny mappe - + There is currently no Trash folder in this project. Det er for øyeblikket ingen papirkurv i dette prosjektet. - + The Trash folder is already empty. Papirkurven er allerede tom. - + Move '{0}' to Trash? Vil du flytte filen "{0}" til søpla? - + Root folders can only be deleted when they are empty. Rotmapper kan bare slettes når de er tomme. - + Permanently delete '{0}'? Slette filen "{0}" for godt? - + Drag and drop is only allowed for single items, non-root items, or multiple items with the same parent. Dra og slipp er bare tillatt for enkeltelementer, ikke hovedmapper, eller elementer under samme mappe eller dokument. - + No documents selected for merging. Ingen dokumenter er valgt for sammenslåing. - + Merged Sammenslått - - + + Could not write document content. Kan ikke skrive til dokumentet. - + Do you want to duplicate this document? Vil du duplisere dette dokumentet? - + Do you want to duplicate this item and all child items? Vil du duplisere dette elementet og alle underelementer? - + Could not duplicate all items. Kunne ikke duplisere alle elementer. - + There is nowhere to add item with name '{0}'. Fant ikke noe sted å legge til enheten med navn {0}'. + + GuiQuoteSelect + + + Select Quote Style + + + GuiSideBar @@ -3300,33 +3459,33 @@ GuiWordList - - + + Project Word List Prosjektets ordliste - + Import words from text file Importer ord fra tekstfil - + Export words to text file Eksporter ord til tekstfil - + Note: The import file must be a plain text file with UTF-8 or ASCII encoding. Merk: Importfilen må være en standard tekstfil med UTF-8 eller ASCII-koding. - + Import File Importer fil - + Export File Eksporter fil @@ -3334,147 +3493,147 @@ GuiWritingStats - + Writing Statistics Statistikk - + Session Start Starttid - + Length Lengde - + Idle Inaktiv - + Words Ord - + Histogram Histogram - + Sum Totals Totalsummer - + Total Time: Totaltid: - + Idle Time: Inaktiv tid: - + Filtered Time: Filtrert tid: - + Novel Word Count: Ord i roman: - + Notes Word Count: Ord i notater: - + Total Word Count: Ord totalt: - + Filters Filtre - + Count novel files Tell i romanfiler - + Count note files Tell i notatfiler - + Hide zero word count Skjul null-verdier - + Hide negative word count Skjul negative verdier - + Group entries by day Samle rader per dag - + Show idle time Vis inaktiv som tid - + Word count cap for the histogram Maks antall ord for histogram - + Save As Lagre som - + JSON Data File (.json) JSON-format (.json) - + CSV Data File (.csv) CSV-format (.csv) - + JSON Data File JSON-format - + CSV Data File CSV-format - + Save Data As Lagre data som - + {0} file successfully written to: {0}-filen ble skrevet til: - + Failed to write {0} file. Kunne ikke skrive {0}-filen. @@ -3482,153 +3641,153 @@ NWProject - + Could not delete document file. Kunne ikke slette dokumentets fil. - + Not a known project file format. Ikke et kjent prosjektfilformat. - + Project file not found. Prosjektfilen finnes ikke. - + Failed to open project. Kunne ikke åpne prosjektet. - + Unknown Ukjent - + Project file does not appear to be a novelWriterXML file. Prosjektfilen later ikke til å være en novelWriterXML-fil. - + 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}. Prosjektfilen har et ukjent eller ikke støttet format, og kan ikke åpnes med denne versjonen av novelWriter. Prosjektet ble lagret av novelWriter versjon {0}. - + Failed to parse project xml. Kunne ikke lese prosjektets xml-data. - + 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? Filformatet til prosjektet ditt er i ferd med å bli oppdatert. Hvis du fortsetter, vil ikke eldre versjoner av novelWriter lenger kunne åpne dette prosjektet. Fortsette? - + 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? Dette prosjektet ble lagret av en nyere versjon av novelWriter, versjon {0}. Dette er versjon {1}. Hvis du ønsker å fortsette med å åpne prosjektet, kan noen av innstillingene bli borte, men selve prosjektet vil være i orden. Vil du fortsatt åpne prosjektet? - + Recovered Gjennopprettet - + Found {0} orphaned file(s) in the project. {1} file(s) were recovered. {0} foreldreløse fil(er) ble funnet i prosjektet. {1} fil(er) ble gjenopprettet. - + Opened Project: {0} Åpnet prosjekt: {0} - + There is no project open. Det er ikke noe prosjekter åpent. - + Failed to save project. Kunne ikke lagre prosjektet. - + Saved Project: {0} Lagret prosjekt: {0} - + Backing up project ... Lager sikkerhetskopi ... - + Cannot backup project because no project name is set. Please set a Project Name in Project Settings. Kan ikke ta sikkerhetskopi av prosjektet da prosjektnavn ikke er satt. Du må først sette et prosjektnavn i Prosjektinnstillinger. - + Could not create backup folder. Kunne ikke lage mappe til sikkerhetskopi. - + Created a backup of your project of size {0}B. Opprettet en sikkerhetskopi av prosjektet med størrelse {0}B. - + Path: {0} Filbane: {0} - + Could not write backup archive. Kunne ikke lage sikkerhetskopi. - + Project backed up to '{0}' Sikkerhetskopi skrevet til '{0}' - - + + New Ny - + Note Notat - + Draft Utkast - + Finished Ferdig - + Minor Mindre - + Major Større - + Main Hoved @@ -3644,89 +3803,89 @@ ProjectBuilder - + The target folder is not empty. Please choose another folder. Den valgte mappen er ikke tom. Vennligst velg en annen mappe. - + An error occurred while trying to create the project. Det oppsto en feil under forsøk på å opprette prosjektet. - + New Project Nytt prosjekt - + Title Page Tittelside - + By Av - + Summary of the chapter. Sammendrag av kapittelet. - + Summary of the scene. Sammendrag av scenen. - + A short description. En kort beskrivelse. - + Chapter {0} Kapittel {0} - - + + Scene {0} Scene {0} - + Main Plot Hovedplott - + Protagonist Protagonist - + Main Location Hovedlokasjon - - + + The target folder already exists. Please choose another folder. Den valgte mappen finnes allerede. Vennligst velg en annen mappe. - + Could not copy project files. Kunne ikke kopiere prosjektfiler. - + Failed to create a new example project. Kunne ikke lage nytt eksempel-prosjekt. - + Failed to create a new example project. Could not find the necessary files. They seem to be missing from this installation. Kunne ikke lage nytt eksempel-prosjekt. Kunne ikke finne de nødvendige filene. De ser ut til å mangle i denne installasjonen. @@ -3863,20 +4022,25 @@ SharedData - + novelWriter Project File or Zip File novelWriter prosjektfil eller Zip-fil - + novelWriter Project File novelWriter prosjektfil - + Open Project Åpne prosjekt + + + Select Font + + VersionInfoWidget @@ -3924,57 +4088,57 @@ _ContentsPage - + Table of Contents Innholdsfortegnelse - + Title Tittel - + Words Ord - + Pages Sider - + Page Side - + Progress Fremdrift - + Words per page Ord per side - + First page offset Første side forskjøvet - + Chapters on odd pages Kapittel på oddetall-sider - + Untitled Uten tittel - + END SLUTT @@ -3982,32 +4146,32 @@ _DetailsWidget - + Setting Innstilling - + Value Verdi - + Name Navn - + Selection Utvalg - + Title Tittel - + Hidden Skjult @@ -4015,37 +4179,37 @@ _FilterTab - + Included in manuscript Inkludert i manuskript - + Excluded from manuscript Ekskludert fra manuskript - + Always included Alltid inkludert - + Always excluded Alltid ekskludert - + Reset to default Tilbakestill til standard - + Mark selection as Merk utvalg som - + Select Root Folders Velg hovedmapper @@ -4053,22 +4217,22 @@ _GuiAlert - + Information Informasjon - + Warning Advarsel - + Error Feil - + Question Spørsmål @@ -4076,93 +4240,93 @@ _HeadingsTab - + Hide Skjul - - + + Editing: {0} Redigerer: {0} - - + + None Ingen - + Title Tittel - + Chapter Number Kapittelnummer - + Chapter Number (Word) Kapittelnummer (som ord) - + Chapter Number (Upper Case Roman) Kapittelnummer (store romertall) - + Chapter Number (Lower Case Roman) Kapittelnummer (små romertall) - + Scene Number (In Chapter) Scenenummer (i kapittel) - + Scene Number (Absolute) Scenenummer (absolutt) - + Point of View Character Synsvinkel-karakter - + Focus Character Fokus-karakter - + Insert Sett inn - + Apply Anvend - + Additional Styling Andre innstillinger - - - + + + Centre Sentrer - - - + + + Page Break Sideskift @@ -4170,117 +4334,117 @@ _NewProjectForm - + Required Påkrevd - + Optional Valgfritt - + Create a fresh project Opprett et nytt prosjekt - + Create an example project Opprett et eksempelprosjekt - + Copy an existing project Kopier et eksisterende prosjekt - + Project Name Prosjektnavn - + Author Forfatter - + Project Path Filbane - + Prefill Project Forhåndsfyll prosjektet - + Set to 0 to only add scenes Satt til 0 for bare å legge til scener - + Add {0} chapter documents Legg til {0} kapitteldokumenter - + Add {0} scene documents (to each chapter) Legg til {0} scenedokumenter (til hvert kapittel) - + Add a folder for plot notes Legg til en mappe for plott-notater - + Add a folder for character notes Legg til en mappe for karakterer - + Add a folder for location notes Legg til en mappe for lokasjoner - + Add example notes to the above Lag eksempelfiler til ovennevnte - + Chapters and Scenes Kapittel og scener - + Project Notes Prosjektnotater - + Create New Project Opprett nytt prosjekt - + Select Project Folder Velg prosjektmappe - + Fresh Project Nytt prosjekt - + Example Project Eksempelprosjekt - + Template: {0} Mal: {0} @@ -4288,7 +4452,7 @@ _NewProjectPage - + A project name is required. Vennligst oppgi et prosjektnavn. @@ -4296,27 +4460,27 @@ _OpenProjectPage - + The project path is not reachable. Prosjektets bane er ikke tilgjengelig. - + Path Filbane - + Remove '{0}' from the recent projects list? The project files will not be deleted. Vil du fjerne {0} fra listen over tidligere åpnede prosjekter? Selve prosjektfilene blir ikke slettet. - + Open Project Åpne prosjekt - + Remove Project Fjern prosjekt @@ -4324,54 +4488,54 @@ _OverviewPage - + Project Prosjekt - - + + Name Navn - + Revisions Revisjoner - + Editing Time Redigeringstid - - + + Word Count Antall ord - + In Novels I romaner - + In Notes I notater - + Selected Novel Velg roman - + Chapters Kapitler - + Scenes Scener @@ -4379,40 +4543,40 @@ _PreviewWidget - + Press the "Preview" button to generate ... Trykk på "Forhåndsvisning"-knappen for å generere ... - + Processing ... Behandler ... - + Done Ferdig - - Unknown - Ukjent - - - + Built Bygget + + + No Preview + + _ProjectListModel - + Word Count Antall ord - + Last Opened Sist åpnet @@ -4420,77 +4584,77 @@ _ReplacePage - + Text Auto-Replace for Preview and Build Erstatt automatisk for forhåndsvisning og manuskript - + Keyword Nøkkelord - + Replace With Erstatt med - + Select item to edit Velg enhet å redigere - - Save - Lagre + + Apply + Anvend _SettingsPage - + Project name Prosjektnavn - + Changing this will affect the backup path. Å endring denne vil påvirke banen til sikkerhetskopier. - + Author(s) Forfatter(e) - - + + Only used when building the manuscript. Brukes kun ved bygging av manuskript. - + Project language Prosjektets språk - + Default Ingen valg - + Spell check language Språk for stavekontroll - - + + Overrides main preferences. Overstyrer valg i innstillinger. - + Disable backup on close Ikke lag sikkerhetskopi når prosjektet lukkes @@ -4498,59 +4662,59 @@ _StatsWidget - - + + Words Ord - - + + Characters Tegn - + Words in Headings Ord i overskrifter - + Words in Text Ord i tekst - + Headings Overskrifter - + Paragraphs Avsnitt - + Characters in Headings Tegn i overskrifter - + Characters in Text Tegn i tekst - + Characters, No Spaces Tegn, utenom mellomrom - + Characters in Headings, No Spaces Tegn i overskrifter, utenom mellomrom - + Characters in Text, No Spaces Tegn i tekst, utenom mellomrom @@ -4558,196 +4722,216 @@ _StatusPage - + Novel Document Status Levels Statusnivåer i roman-filer - + Project Note Importance Levels Viktighetsnivåer i notatfiler - - Label - Navn - - - - Usage - Bruk - - - - Select item to edit - Velg enhet å redigere - - - - Colour - Farge - - - - Save - Lagre - - - - Select Colour - Velg farge - - - - New Item - Legg til - - - - Cannot delete a status item that is in use. - Kan ikke slette status som er i bruk. - - - + Not in use Ikke i bruk - + Used once Brukt ett sted - + Used by {0} items Brukt {0} steder + + + Select Colour + Velg farge + + + + Label + Navn + + + + Usage + Bruk + + + + Select item to edit + Velg enhet å redigere + + + + Colour + Farge + + + + Circles ... + + + + + Bars ... + + + + + Blocks ... + + + + + Shape + + + + + Apply + Anvend + + + + New Item + Legg til + + + + Cannot delete a status item that is in use. + Kan ikke slette status som er i bruk. + _TreeContextMenu - + Empty Trash Tøm papirkurven - + Rename Endre navn - + Open Document Åpne dokument - + View Document Vis dokument - + Create New ... Opprett ny ... - + Rename to Heading Endre navn til overskriften - + Set Active to ... Sett aktiv til ... - + Toggle Active Aktiver/deaktiver - + Set Status to ... Sett status til ... - - + + Manage Labels ... Administrer etiketter ... - + Set Importance to ... Sett viktighetsnivå til ... - + Transform ... Endre ... - - - - + + + + Convert to {0} Konverter til {0} - + Merge Child Items into Self Lim inn underelementer i dette dokumentet - + Merge Child Items into New Lim inn underelementer i nytt dokument - + Merge Documents in Folder Slå sammen dokumenter i mappen - + Split Document by Headings Splitt dokumentet etter overskrifter - + Expand All Utvid alle - + Collapse All Lukk alle - + Duplicate Dupliser - - + + Delete Permanently Slett permanent - - + + Move to Trash Flytt til papirkurv - + Move {0} items to Trash? Vil du flytte {0} filer til papirkurven? - + Do you want to convert the folder to a {0}? This action cannot be reversed. Vil du konvertere mappen til et {0}? Denne handlingen kan ikke angres. @@ -4755,7 +4939,7 @@ _UpdatableMenu - + From Template Fra mal @@ -4763,12 +4947,12 @@ _ViewPanelBackRefs - + Document Dokument - + First Heading Første overskrift @@ -4776,27 +4960,27 @@ _ViewPanelKeyWords - + Tag Knagg - + Importance Viktighet - + Document Dokument - + Heading Overskrift - + Short Description Kort beskrivelse diff --git a/i18n/nw_nl_NL.ts b/i18n/nw_nl_NL.ts index 4e77e7cb..eb170d03 100644 --- a/i18n/nw_nl_NL.ts +++ b/i18n/nw_nl_NL.ts @@ -4,232 +4,242 @@ Builds - + Document Filters Document Filters - + Novel Documents Roman bestanden - + Project Notes Projectnotities - + Inactive Documents Inactieve documenten - + Headings Koppen - + Partition Format Partitie indeling - + Chapter Format Hoofdstuk indeling - + Unnumbered Format Ongenummerde indeling - + Scene Format Scène indeling - + Alt. Scene Format Alt. Scène Formaat - + Section Format Sectie indeling - + Text Content Tekstinhoud - + Include Synopsis Inclusief synopsis - + Include Comments Inclusief opmerkingen - + Include Keywords Inclusief trefwoorden - + Include Body Text Inclusief inhoudstekst - + Ignore These Keywords Negeer deze sleutelwoorden - + Insert Content Inhoud invoegen - + Add Titles for Notes Titels voor notities toevoegen - + Text Format Tekstformaat - - - Font Family - Lettertypefamilie - - - - Font Size - Lettertypegrootte - + Text Font + + + + Line Height Regelhoogte - + Text Options Tekstopties - + Justify Text Margins Tekstmarges uitlijnen - + Replace Unicode Characters Unicode karakters vervangen - + Replace Tabs with Spaces Vervang tabs door spaties - - - Page Layout - Pagina lay-out - - Unit - Eenheid - - - - Page Size - Paginagrootte - - - - Page Width - Paginabreedte - - - - Page Height - Paginahoogte - - - - Top Margin - Bovenmarge - - - - Bottom Margin - Ondermarge - - - - Left Margin - Linkermarge - - - - Right Margin - Rechtermarge - - - - Open Document (.odt) - Open Document (.odt) - - - - Add Highlight Colours - Voeg markeerkleuren toe - - - - Page Header - Pagina kop - - - - Page Counter Offset - Pagina teller offset - - - - First Line Indent - Eerste regel inspringen - - - - Markdown (.md) - Markdown (.md) - - - Preserve Hard Line Breaks Behoud harde regel afbrekingen + + + Apply Dialogue Highlighting + + + + + First Line Indent + Eerste regel inspringen + + + + Enable Indent + + + + + Indent Width + + + + + Indent First Paragraph + + + + + Page Layout + Pagina lay-out + + + + Unit + Eenheid + + + + Page Size + Paginagrootte + + + + Page Width + Paginabreedte + + + + Page Height + Paginahoogte + + + + Top Margin + Bovenmarge + + + + Bottom Margin + Ondermarge + + + + Left Margin + Linkermarge + + + + Right Margin + Rechtermarge + + Open Document (.odt) + Open Document (.odt) + + + + Add Highlight Colours + Voeg markeerkleuren toe + + + + Page Header + Pagina kop + + + + Page Counter Offset + Pagina teller offset + + + HTML (.html) HTML (.html) - + Add CSS Styles CSS stijlen toevoegen - + Preserve Tab Characters Tab tekens behouden @@ -237,72 +247,72 @@ Common - + in the future in de toekomst - + just now zojuist - + a minute ago een minuut geleden - + {0} minutes ago {0} minuten geleden - + an hour ago een uur geleden - + {0} hours ago {0} uur geleden - + a day ago een dag geleden - + {0} days ago {0} dagen geleden - + a week ago een week geleden - + {0} weeks ago {0} weken geleden - + a month ago een maand geleden - + {0} months ago {0} maanden geleden - + a year ago een jaar geleden - + {0} years ago {0} jaren geleden @@ -310,375 +320,475 @@ Constant - - - + + + None Geen - + Novel Roman - - + + Plot Plot - - + + Characters Personages - - + + Locations Locaties - - + + Timeline Tijdslijn - - + + Objects Objecten - - + + Entities Entiteiten - - - + + + Custom Custom - + Archive Archief - + Templates Templates - + Trash Prullenbak - - + + Novel Document Roman Document - - + + Project Note Project Notitie - + Root Folder Hoofdmap - + Folder Map - + Novel Title Page Roman Titel Pagina - + Novel Chapter Roman Hoofdstuk - + Novel Scene Roman Scene - + Novel Section Roman Sectie - + Tag Label - + Point of View Perspectief - - + + Focus Focus - + Title Titel - + Level Niveau - + Document Document - + Line Regel - + Chars Tekens - + Words Woorden - + Pars Par. - + POV Perspectief - + Synopsis Synopsis - + Open Document (.odt) Open Document (.odt) - + Flat Open Document (.fodt) Plat Open Document (.fodt) - + novelWriter HTML (.html) novelWriter HTML (.html) - + novelWriter Markup (.txt) novelWriter Opmaak (.txt) - + Standard Markdown (.md) Standaard Markdown (.md) - + Extended Markdown (.md) Uitgebreide Markdown (.md) - + JSON + novelWriter HTML (.json) JSON + novelWriter HTML (.json) - + JSON + novelWriter Markup (.json) JSON + novelWriter Opmaak (.json) + + + Square + + + + + Triangle + + + + + Nabla + + + + + Diamond + + + + + Pentagon + + + + + Hexagon + + + Star + + + + + Pacman + + + + + 1/4 Circle + + + + + Half Circle + + + + + 3/4 Circle + + + + + Full Circle + + + + + 1 Bar + + + + + 2 Bars + + + + + 3 Bars + + + + + 4 Bars + + + + + 1 Block + + + + + 2 Blocks + + + + + 3 Blocks + + + + + 4 Blocks + + + + Text files Tekst bestanden - + Markdown files Markdown bestanden - + novelWriter files novelWriter bestanden - + CSV files CSV bestanden - + All files Alle bestanden - + Millimetres Millimeters - + Centimetres Centimeters - + Inches Inches - + A4 A4 - + A5 A5 - + A6 A6 - + US Legal US Legal - + US Letter US Letter - + Straight single quotation mark Recht enkel aanhalingsteken - + Straight double quotation mark Recht dubbel aanhalingsteken - + Left single quotation mark Linker enkel aanhalingsteken - + Right single quotation mark Rechter enkel aanhalingsteken - + Single low-9 quotation mark Enkel lage-9 aanhalingsteken - + Single high-reversed-9 quotation mark Enkel hoog-omgekeerd-9 aanhalingsteken - + Left double quotation mark Linker dubbel aanhalingsteken - + Right double quotation mark Rechter dubbel aanhalingsteken - + Double low-9 quotation mark Dubbel lage-9 aanhalingsteken - + Double high-reversed-9 quotation mark Dubbel hoog-omgekeerd-9 aanhalingsteken - + Double low-reversed-9 quotation mark Dubbel laag-omgekeerd-9 aanhalingsteken - + Single left-pointing angle quotation mark Enkel links-wijzende hoek aanhalingsteken - + Single right-pointing angle quotation mark Enkel rechts-wijzende hoek aanhalingsteken - + Double left-pointing angle quotation mark Dubbel links-wijzende hoek aanhalingsteken - + Double right-pointing angle quotation mark Dubbel rechts-wijzende hoek aanhalingsteken - + Left corner bracket Linker hoekbeugel - + Right corner bracket Rechter hoekbeugel - + Left white corner bracket Linker holle hoekbeugel - + Right white corner bracket Rechter holle hoekbeugel @@ -704,38 +814,38 @@ GuiBuildSettings - - + + Manuscript Build Settings Manuscript bouw instellingen - + Name Naam - + Selection Selectie - + Headings Koppen - + Content Inhoud - + Format Formaat - + Output Uitvoer @@ -783,7 +893,7 @@ Woordenboekbestand kan niet worden verwerkt - + Added: {0} [{1}B] Toegevoegd: {0} [{1}B] @@ -791,22 +901,22 @@ GuiDocEditFooter - + Line: {0} ({1}) Regel: {0} ({1}) - + Words: {0} ({1}) Woorden: {0} ({1}) - + Words: {0} selected Woorden: {0} geselecteerd - + Status Status @@ -814,27 +924,27 @@ GuiDocEditHeader - + Toggle Tool Bar Toon/verberg werkbalk - + Outline Samenvatting - + Search Zoek - + Toggle Focus Mode Schakel focus modus in/uit - + Close Sluiten @@ -842,62 +952,62 @@ GuiDocEditSearch - + Search for Zoek naar - + Replace with Vervang door - + Search Zoek - + Case Sensitive Hoofdlettergevoelig - + Whole Words Only Alleen hele woorden - + RegEx Mode RegEx modus - + Loop Search Zoekopdracht lus - + Search Next File Doorzoek volgend bestand - + Preserve Case Behoud hoofd/kleine letters - + Close Search Zoekopdracht afsluiten - + Find in current document Zoeken in huidige document - + Find and replace in current document Zoek en vervang in huidig document @@ -905,122 +1015,122 @@ GuiDocEditor - + Opened Document: {0} Geopend document: {0} - + This document has been changed outside of novelWriter while it was open. Overwrite the file on disk? Dit document is gewijzigd buiten de openstaande novelWriter instantie. Het bestand op de schijf overschrijven? - + Could not save document. Kon document niet opslaan. - + Saved Document: {0} Document opgeslagen: {0} - + Spell checking requires the package PyEnchant. It does not appear to be installed. Spellingscontrole vereist het pakket PyEnchant. Het lijkt niet geïnstalleerd te zijn. - + Spell check complete Spellingscontrole compleet - + Document Details Document details - + Created: {0} Aangemaakt: {0} - + Updated: {0} Bijgewerkt: {0} - + File Location: {0} Bestandslocatie: {0} - + Set as Document Name Instellen als documentnaam - + Follow Tag Volg label - + Create Note for Tag Creëer notitie voor label - + Cut Knippen - + Copy Kopiëren - + Paste Plakken - + Select All Selecteer alles - + Select Word Selecteer woord - + Select Paragraph Selecteer paragraaf - + Spelling Suggestion(s) Spelling suggestie(s) - + No Suggestions Geen suggesties - + Add Word to Dictionary Woord toevoegen aan woordenboek - + Please select some text before calling replace quotes. Selecteer a.u.b. een tekst voordat u vervang aanhalingstekens aanroept. - + Do you want to create a new project note for the tag '{0}'? Wilt u een nieuwe project notitie maken voor het label '{0}'? @@ -1104,52 +1214,52 @@ GuiDocToolBar - + Markdown Bold Markdown vet - + Markdown Italic Markdown cursief - + Markdown Strikethrough Markdown doorstrepen - + Shortcode Bold Korte code vet - + Shortcode Italic Korte code cursief - + Shortcode Strikethrough Korte code doorstrepen - + Shortcode Underline Korte code onderstrepen - + Shortcode Highlight Snelkoppeling accentuering - + Shortcode Superscript Korte code superscript - + Shortcode Subscript Korte code subscript @@ -1157,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel Toon/verberg bekijker paneel - + Comments Opmerkingen - + Show Comments Opmerkingen weergeven - + Synopsis Synopsis - + Show Synopsis Comments Toon synopsis commentaren @@ -1185,27 +1295,27 @@ GuiDocViewHeader - + Outline Samenvatting - + Go Backward Ga terug - + Go Forward Ga vooruit - + Reload Herladen - + Close Sluiten @@ -1213,27 +1323,27 @@ GuiDocViewer - + An error occurred while generating the preview. Er is een fout opgetreden tijdens het genereren van het voorbeeld. - + Copy Kopiëren - + Select All Selecteer alles - + Select Word Selecteer woord - + Select Paragraph Selecteer paragraaf @@ -1254,12 +1364,12 @@ GuiEditLabel - + Item Label Item Label - + Label Label @@ -1267,37 +1377,37 @@ GuiItemDetails - + Label Label - + Status Status - + Class Klasse - + Usage Gebruik - + Characters Tekens - + Words Woorden - + Paragraphs Paragrafen @@ -1305,27 +1415,27 @@ GuiLipsum - + Insert Placeholder Text Plaatshouder Tekst Invoegen - + Insert Lorem Ipsum Text Lorem Ipsum Tekst Invoegen - + Number of paragraphs Aantal paragrafen - + Randomise order Volgorde willekeurig maken - + Insert Invoegen @@ -1333,78 +1443,78 @@ GuiMain - + novelWriter is ready ... novelWriter is klaar ... - + You are now running novelWriter version {0}. U gebruikt nu novelWriter versie {0}. - + Please check the {0}release notes{1} for further details. Controleer a.u.b. de {0}release notes{1} voor verdere details. - + Close the current project? Sluit het huidige project? - - + + Changes are saved automatically. Wijzigingen worden automatisch opgeslagen. - + Backup the current project? Reservekopie maken van het huidige project? - + The project is already open by another instance of novelWriter, and is therefore locked. Override lock and continue anyway? Het project is al geopend door een andere instantie van novelWriter, en is daarom vergrendeld. Vergrendeling negeren en toch verder gaan? - + 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. Opmerking: als het programma of de computer eerder is vastgelopen, kan de vergrendeling veilig worden genegeerd. Het wordt echter niet aanbevolen als het project open is in een andere instantie van novelWriter. Toch doen kan het project beschadigen. - + The project was locked by the computer '{0}' ({1} {2}), last active on {3}. Het project is vergrendeld door de computer '{0}' ({1} {2}), voor het laatst actief op {3}. - + The project index is outdated or broken. Rebuilding index. De projectindex is verouderd of gebroken. De index wordt herbouwd. - + Import File Importeer bestand - + Could not read file. The file must be an existing text file. Kon het bestand niet lezen. Het bestand moet een bestaand tekst bestand zijn. - + Please open a document to import the text file into. Open a.u.b. een document om het tekst bestand in te importeren. - + Importing the file will overwrite the current content of the document. Do you want to proceed? Het importeren van het bestand overschrijft de huidige inhoud van het document. Wilt u doorgaan? - + Indexing completed in {0} ms Indexeren voltooid in {0} ms @@ -1414,22 +1524,22 @@ De projectindex is succesvol opnieuw opgebouwd. - + Could not initialise the dialog. Kon de dialoog niet initialiseren. - + Do you want to exit novelWriter? Wil je novelWriter afsluiten? - + Some changes will not be applied until novelWriter has been restarted. Sommige wijzigingen zullen niet worden toegepast totdat novelWriter opnieuw is gestart. - + 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}. Kon de verwijzing voor tag '{0}' niet vinden. Hij bestaat niet of de index is verouderd. De index kan worden bijgewerkt in het Hulpmiddelen menu, of door op {1} te drukken. @@ -1573,13 +1683,13 @@ - Go to Project Tree - Ga naar projectboom + Go to Tree View + - Go to Document Editor - Ga naar document tekstbewerker + Go to Document + @@ -1797,297 +1907,302 @@ Plaatshouder tekst - + + Footnote + + + + &Format Opmaak - + Bold Vet - + Italic Cursief - + Strikethrough Doorhalen - + Wrap Double Quotes Dubbele aanhalingstekens omwikkelen - + Wrap Single Quotes Enkel aanhalingsteken omwikkelen - + More Formats ... Meer formaten... - + Bold (Shortcode) Vet (korte code) - + Italics (Shortcode) Cursief (korte code) - + Strikethrough (Shortcode) Doorstreep (korte code) - + Underline Onderstrepen - + Highlight Markeren - + Superscript Superscript - + Subscript Subscript - + Heading 1 (Partition) Kop 1 (Partitie) - + Heading 2 (Chapter) Kop 2 (Hoofdstuk) - + Heading 3 (Scene) Kop 3 (Scène) - + Heading 4 (Section) Kop 4 (Sectie) - + Novel Title Roman titel - + Unnumbered Chapter Ongenummerd hoofdstuk - + Alternative Scene Alternatieve scène - + Align Left Links uitlijnen - + Align Centre Centreren - + Align Right Rechts uitlijnen - + Indent Left Links inspringen - + Indent Right Rechts inspringen - + Toggle Comment Opmerking in-/uitschakelen - + Toggle Ignore Text Schakel tekst negeren - + Remove Block Format Verwijder blokformaat - + Replace Straight Single Quotes Vervang rechte enkele aanhalingstekens - + Replace Straight Double Quotes Vervang rechte dubbele aanhalingstekens - + Remove In-Paragraph Breaks Verwijder in-paragraaf onderbrekingen - + &Search &Zoeken - + Find Vinden - + Replace Vervangen - + Find Next Volgende zoeken - + Find Previous Vorige zoeken - + Replace Next Vervang volgende - + Find in Project Zoek in project - + &Tools &Hulpmiddelen - + Check Spelling Spelling controleren - + Spell Check Language Taal voor spellingscontrole - + Default Standaard - + Re-Run Spell Check Spellingscontrole opnieuw uitvoeren - + Project Word List Project woordenlijst - + Add Dictionaries Woordenboeken toevoegen - + Rebuild Index Index opnieuw opbouwen - + Backup Project Project reservekopie maken - + Build Manuscript Bouw manuscript - + Writing Statistics Schrijf statistieken - + Preferences Voorkeuren - + &Help &Help - + About novelWriter Over novelWriter - + About Qt5 Over Qt5 - + User Manual (Online) Gebruikershandleiding (Online) - + User Manual (PDF) Gebruikershandleiding (PDF) - + Report an Issue (GitHub) Meld een probleem (GitHub) - + Ask a Question (GitHub) Stel een vraag (GitHub) - + The novelWriter Website De novelWriter website @@ -2096,22 +2211,22 @@ GuiMainStatus - + None Geen - + Editor Tekstbewerker - + Project Project - + Session Time Sessieduur @@ -2134,63 +2249,63 @@ GuiManuscript - + Build Manuscript Bouw manuscript - + Add New Build Voeg nieuw bouwwerk toe - + Delete Selected Build Verwijder geselecteerd bouwwerk - + Edit Selected Build Bewerk geselecteerd bouwwerk - + Builds Bouwwerken - + Details Details - + Outline Samenvatting - + Preview Voorvertoning - + Print Afdrukken - + Build Bouwen - + Close Sluiten - - + + My Manuscript Mijn manuscript @@ -2256,18 +2371,18 @@ GuiNovelDetails - - + + Novel Details Roman details - + Overview Overzicht - + Contents Inhoud @@ -2275,58 +2390,58 @@ GuiNovelToolBar - + Outline of {0} Omlijning van {0} - + Novel Root Roman Hoofdmap - + Refresh Verversen - + Last Column Laatste Kolom - + Hidden Verborgen - + Point of View Character Perspectief Karakter - + Focus Character Focus Karakter - + Novel Plot Roman Plot - - + + Column Size Kolom grootte - + More Options Meer Opties - + Maximum column size in % Maximum kolom grootte in % @@ -2334,7 +2449,7 @@ GuiNovelTree - + No meta data Geen metadata @@ -2342,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title Titel - + Chapter Hoofdstuk - + Scene Scène - + Section Sectie - + Document Document - + Status Status - + Characters Tekens - + Words Woorden - + Paragraphs Paragrafen - + Synopsis Synopsis - + Title Details Titel Details - + Reference Tags Referentie Tags @@ -2407,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns Selecteer Kolommen @@ -2415,17 +2530,17 @@ GuiOutlineToolBar - + Outline of Omlijning van - + Refresh Verversen - + Export CSV Exporteren als CSV @@ -2433,7 +2548,7 @@ GuiOutlineTree - + Save Outline As Sla omlijning op als @@ -2441,553 +2556,589 @@ GuiPreferences - - + + Preferences Voorkeuren - + Search Zoek - + General Algemeen - + Appearance Uiterlijk - + Display language Weergavetaal - - - + + Requires restart to take effect. Vereist herstart om van kracht te worden. - + Colour theme Kleurenthema - + General colour theme and icons. Algemene kleuren thema en iconen. - - Application font family - Applicatie lettertype familie + + Application font + - - Application font size - Applicatie lettergrootte - - - - - pt - pt - - - + Hide vertical scroll bars in main windows Verticale schuifbalken in hoofdvensters verbergen - - + + Scrolling available with mouse wheel and keys only. Scrollen alleen beschikbaar met muiswiel en toetsen. - + Hide horizontal scroll bars in main windows Verberg horizontale schuifbalken in hoofdvensters + + + Use the system's font selection dialog + + + Turn off to use the Qt font dialog, which may have more options. + + + + Document Style Document stijl - + Document colour theme Document kleurenthema - + Colour theme for the editor and viewer. Kleur thema voor de tekstbewerker en kijker. - - Document font family - Lettertype familie document + + Document font + - - - - + + + Applies to both document editor and viewer. Van toepassing op zowel de documentbewerker als de kijker. - - Document font size - Lettergrootte document - - - + Emphasise partition and chapter labels Partitie en hoofdstuk labels benadrukken - + Makes them stand out in the project tree. Laat ze opvallen in de projectboom. - + Show full path in document header Volledig pad in document kop weergeven - + Add the parent folder names to the header. Voeg de bovenliggende mapnamen toe aan de kop. - + Include project notes in status bar word count Project notities opnemen in de statusbalk woord telling - + Auto Save Automatisch opslaan - + Save document interval Document opslag interval - + How often the document is automatically saved. Hoe vaak het document automatisch wordt opgeslagen. - - + + seconds seconden - + Save project interval Project opslag interval - + How often the project is automatically saved. Hoe vaak het project automatisch wordt opgeslagen. - + Project Backup Project Reservekopie - + Browse Blader - + Backup storage location Opslaglocatie voor reservekopie - - + + Path: {0} Pad: {0} - + Run backup when the project is closed Reservekopie maken wanneer het project wordt gesloten - + Can be overridden for individual projects in Project Settings. Kan voor individuele projecten overschreven worden in Projectinstellingen. - + Ask before running backup Vraag voor het maken van een reservekopie - + If off, backups will run in the background. Indien uit, worden reservekopieën op de achtergrond gemaakt. - + Session Timer Sessie Timer - + Pause the session timer when not writing De sessie timer pauzeren wanneer niet geschreven wordt - + Also pauses when the application window does not have focus. Pauzeert ook wanneer het toepassingsvenster geen focus heeft. - + Editor inactive time before pausing timer Inactieve tekstbewerker duur voordat timer wordt gepauzeerd - + User activity includes typing and changing the content. Gebruikersactiviteit omvat typen en het wijzigen van de inhoud. - + minutes minuten - + Writing Schrijven - + Text Flow Tekst Flow - + Maximum text width in "Normal Mode" Maximale tekstbreedte in "Normale Modus" - + Set to 0 to disable this feature. Stel in op 0 om deze functie uit te schakelen. - - - - + + + + px px - + Maximum text width in "Focus Mode" Maximale tekstbreedte in "Focus Modus" - + The maximum width cannot be disabled. De maximale breedte kan niet worden uitgeschakeld. - + Hide document footer in "Focus Mode" Verberg document voettekst in "Focus Modus" - + Hide the information bar in the document editor. Verberg de informatiebalk in de documentbewerker. - + Justify the text margins De tekstmarges uitvullen - + Minimum text margin Minimale tekstmarge - + Tab width Tab breedte - + The width of a tab key press in the editor and viewer. De breedte van een tab teken in de tekstbewerker en kijker. - + Text Editing Tekstbewerking - + Spell check language Taal voor spellingscontrole - + Available languages are determined by your system. Beschikbare talen worden bepaald door uw systeem. - + Auto-select word under cursor Automatisch woord onder cursor selecteren - + Apply formatting to word under cursor if no selection is made. Opmaak toepassen op woord onder de cursor als er geen selectie is gemaakt. - + Show tabs and spaces Tabs en spaties weergeven - + Show line endings Regeleindes weergeven - + Editor Scrolling Bewerker scrollen - + Scroll past end of the document Scroll voorbij het einde van het document - + Also centres the cursor when scrolling. Centreer ook de cursor bij het scrollen. - + Typewriter style scrolling when you type Schrijfmachine stijl scrollen bij het typen - + Keeps the cursor at a fixed vertical position. Houd de cursor op een vaste verticale positie. - + Minimum position for Typewriter scrolling Minimumpositie voor Schrijfmachine scrollen - + Percentage of the editor height from the top. Percentage van de tekstverwerker hoogte vanaf de bovenkant. - + Text Highlighting Tekstmarkering - - Highlight text wrapped in quotes - Markeer tekst verpakt in aanhalingstekens + + None + Geen - - - - Applies to the document editor only. - Alleen van toepassing op de tekst bewerker. + + Single Quotes + + + + + Double Quotes + + + + + Both + + + + + Highlight dialogue + + + + + Applies to the selected quote styles. + + + + + Allow open-ended dialogue + - Allow open-ended single quotes - Toestaan van open einde enkele aanhalingstekens + Highlight dialogue line with no closing quote. + - - Highlight single-quoted line with no closing quote. - Markeer regel zonder afsluitend enkel aanhalingsteken. + + Dialogue narrator break symbol + - - Allow open-ended double quotes - Toestaan van open einde dubbele aanhalingstekens + + Symbol to indicate injected narrator break. + - - Highlight double-quoted line with no closing quote. - Markeer regel zonder afsluitend dubbel aanhalingsteken. + + Dialogue line symbol + - + + Lines starting with this symbol are dialogue. + + + + + Alternative dialogue symbols + + + + + Custom highlighting of dialogue text. + + + + Add highlight colour to emphasised text Voeg markeerkleur toe aan geaccentueerde tekst - + + + Applies to the document editor only. + Alleen van toepassing op de tekst bewerker. + + + Highlight multiple or trailing spaces Markeer meerdere of afsluitende spaties - + Text Automation Tekstautomatisering - + Auto-replace text as you type Automatisch tekst vervangen terwijl u typt - + Allow the editor to replace symbols as you type. Sta de tekstbewerker toe om symbolen te vervangen terwijl u typt. - + Auto-replace single quotes Automatisch enkele aanhalingstekens vervangen - - + + Try to guess which is an opening or a closing quote. Probeer te raden wat een openend of afsluitend aanhalingsteken is. - + Auto-replace double quotes Automatisch dubbele aanhalingstekens vervangen - + Auto-replace dashes Automatisch streepjes vervangen - + Double and triple hyphens become short and long dashes. Dubbele en drievoudige koppeltekens worden korte en lange streepjes. - + Auto-replace dots Automatisch stippen vervangen - + Three consecutive dots become ellipsis. Drie opeenvolgende stippen worden ellips. - + Insert non-breaking space before Vaste spatie invoegen voor - + Automatically add space before any of these symbols. Voeg automatisch een spatie toe voor één van deze symbolen. - + Insert non-breaking space after Vaste spatie invoegen na - + Automatically add space after any of these symbols. Voeg automatisch een spatie toe na één van deze symbolen. - + Use thin space instead Gebruik dunne spatie in plaats van - + Inserts a thin space instead of a regular space. Voegt een dunne spatie toe in plaats van een normale spatie. - + Quotation Style Citeer Stijl - + Single quote open style Enkel aanhalingsteken open stijl - + The symbol to use for a leading single quote. Het symbool om te gebruiken voor een leidend enkel aanhalingsteken. - + Single quote close style Enkel aanhalingsteken sluit stijl - + The symbol to use for a trailing single quote. Het symbool om te gebruiken voor een afsluitend enkel aanhalingsteken. - + Double quote open style Dubbele aanhalingsteken open stijl - + The symbol to use for a leading double quote. Het symbool om te gebruiken voor een leidend dubbel aanhalingsteken. - + Double quote close style Dubbel aanhalingsteken sluit stijl - + The symbol to use for a trailing double quote. Het symbool om te gebruiken voor een afsluitend dubbel aanhalingsteken. - + Backup Directory Reservekopie map @@ -3023,28 +3174,28 @@ GuiProjectSettings - - + + Project Settings Project Instellingen - + Settings Instellingen - + Status Status - + Importance Belangrijkheid - + Auto-Replace Auto-Vervang @@ -3052,47 +3203,47 @@ GuiProjectToolBar - + Project Content Project Inhoud - + Quick Links Snelle Koppelingen - + Move Up Omhoog Schuiven - + Move Down Omlaag Schuiven - + Add Item Item Toevoegen - + Expand All Alles Uitklappen - + Collapse All Alles Samenvouwen - + Empty Trash Leeg Prullenbak - + More Options Meer Opties @@ -3100,122 +3251,130 @@ GuiProjectTree - + Active Actief - + Inactive Inactief - + Permanently delete {0} file(s) from Trash? {0} bestand(en) permanent verwijderen uit de prullenbak? - + Did not find anywhere to add the file or folder! Kon geen plek vinden om het bestand of de map aan toe te voegen! - + Cannot add new files or folders to the Trash folder. Kan geen nieuwe bestanden of mappen toevoegen aan de Prullenbak map. - + New Note Nieuwe notitie - + New Chapter Nieuw Hoofdstuk - + New Scene Nieuwe Scène - + New Document Nieuw document - + New Folder Nieuwe map - + There is currently no Trash folder in this project. Er is momenteel geen Prullenbak map in dit project. - + The Trash folder is already empty. De Prullenbak map is al leeg. - + Move '{0}' to Trash? Verplaats '{0}' naar Prullenbak? - + Root folders can only be deleted when they are empty. Root mappen kunnen alleen verwijderd worden wanneer ze leeg zijn. - + Permanently delete '{0}'? '{0}' permanent verwijderen? - + Drag and drop is only allowed for single items, non-root items, or multiple items with the same parent. Slepen en neerzetten is alleen toegestaan voor enkele items, niet-hoofditems of meerdere items met dezelfde bovenliggende item. - + No documents selected for merging. Geen documenten geselecteerd voor samenvoegen. - + Merged Samengevoegd - - + + Could not write document content. Kon documenteninhoud niet schrijven. - + Do you want to duplicate this document? Wilt u dit document dupliceren? - + Do you want to duplicate this item and all child items? Wilt u dit item en alle onderliggende items dupliceren? - + Could not duplicate all items. Kon niet alle items dupliceren. - + There is nowhere to add item with name '{0}'. Er is geen plek om item toe te voegen met de naam '{0}'. + + GuiQuoteSelect + + + Select Quote Style + + + GuiSideBar @@ -3300,33 +3459,33 @@ GuiWordList - - + + Project Word List Project woordenlijst - + Import words from text file Importeer woorden uit tekstbestand - + Export words to text file Exporteer woorden naar tekstbestand - + Note: The import file must be a plain text file with UTF-8 or ASCII encoding. Opmerking: Het import bestand moet een platte tekst bestand zijn met UTF-8 of ASCII codering. - + Import File Importeer bestand - + Export File Bestand exporteren @@ -3334,147 +3493,147 @@ GuiWritingStats - + Writing Statistics Schrijf Statistieken - + Session Start Sessie Start - + Length Lengte - + Idle Inactief - + Words Woorden - + Histogram Histogram - + Sum Totals Som totalen - + Total Time: Totale tijd: - + Idle Time: Inactieve tijd: - + Filtered Time: Gefilterde tijd: - + Novel Word Count: Roman woord telling: - + Notes Word Count: Notities woord telling: - + Total Word Count: Totaal woord telling: - + Filters Filters - + Count novel files Roman bestanden meetellen - + Count note files Notitie bestanden tellen - + Hide zero word count Verberg nul woorden telling - + Hide negative word count Verberg negatieve woord telling - + Group entries by day Vermeldingen groeperen per dag - + Show idle time Inactieve tijd weergeven - + Word count cap for the histogram Woord telling limiet voor het histogram - + Save As Opslaan als - + JSON Data File (.json) JSON-gegevensbestand (.json) - + CSV Data File (.csv) CSV-gegevensbestand (.csv) - + JSON Data File JSON-gegevensbestand - + CSV Data File CSV-gegevensbestand - + Save Data As Gegevens opslaan als - + {0} file successfully written to: {0} bestand succesvol weggeschreven naar: - + Failed to write {0} file. Schrijven van {0} bestand mislukt. @@ -3482,153 +3641,153 @@ NWProject - + Could not delete document file. Kon documentbestand niet verwijderen. - + Not a known project file format. Niet een bekend project bestandsformaat. - + Project file not found. Projectbestand niet gevonden. - + Failed to open project. Kon project niet openen. - + Unknown Onbekend - + Project file does not appear to be a novelWriterXML file. Projectbestand lijkt geen novelWriter XML-bestand te zijn. - + 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}. Onbekend of niet ondersteund bestandsformaat van novelWriter. Het project kan niet worden geopend door deze versie van novelWriter. Het bestand was opgeslagen met versie {0} van novelWriter. - + Failed to parse project xml. Parsen van project xml mislukt. - + 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? De bestandsindeling van uw project zal worden bijgewerkt. Als u doorgaat, kunnen oudere versies van novelWriter dit project niet meer openen. Doorgaan? - + 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? Dit project was aangemaakt door een nieuwere versie van novelWriter, versie {0}. Dit is versie {1}. Als je het project blijft openen, kunnen sommige kenmerken en instellingen niet worden behouden, maar over het algemeen moet het project goed zijn. Doorgaan met het openen van het project? - + Recovered Hersteld - + Found {0} orphaned file(s) in the project. {1} file(s) were recovered. Gevonden {0} weesbestand(en) in het project. {1} bestand(en) werd(en) hersteld. - + Opened Project: {0} Geopend project: {0} - + There is no project open. Er is geen project open. - + Failed to save project. Opslaan project mislukt. - + Saved Project: {0} Project opgeslagen: {0} - + Backing up project ... Reservekopie van project wordt gemaakt... - + Cannot backup project because no project name is set. Please set a Project Name in Project Settings. Kan geen back-up maken van het project omdat er geen projectnaam is ingesteld. Stel een projectnaam in in Projectinstellingen. - + Could not create backup folder. Kon de reservekopie map niet maken. - + Created a backup of your project of size {0}B. Een back-up gemaakt van je project van grootte {0}B. - + Path: {0} Pad: {0} - + Could not write backup archive. Kon reservekopie archief niet wegschrijven. - + Project backed up to '{0}' Project reservekopie gemaakt naar '{0}' - - + + New Nieuw - + Note Notitie - + Draft Concept - + Finished Voltooid - + Minor Klein - + Major Groot - + Main Hoofd @@ -3644,89 +3803,89 @@ ProjectBuilder - + The target folder is not empty. Please choose another folder. De doelmap is niet leeg. Kies een andere map. - + An error occurred while trying to create the project. Er is een fout opgetreden tijdens het aanmaken van het project. - + New Project Nieuw Project - + Title Page Titel Pagina - + By Door - + Summary of the chapter. Samenvatting van het hoofdstuk. - + Summary of the scene. Samenvatting van de scène. - + A short description. Een korte beschrijving. - + Chapter {0} Hoofdstuk {0} - - + + Scene {0} Scène {0} - + Main Plot Hoofd Plot - + Protagonist Protagonist - + Main Location Hoofd Locatie - - + + The target folder already exists. Please choose another folder. De doelmap bestaat al. Kies een andere map. - + Could not copy project files. Kon projectbestanden niet kopiëren. - + Failed to create a new example project. Aanmaken van een nieuw voorbeeldproject is mislukt. - + Failed to create a new example project. Could not find the necessary files. They seem to be missing from this installation. Aanmaken van een nieuw voorbeeldproject is mislukt. Kon de benodigde bestanden niet vinden. Ze lijken te ontbreken in deze installatie. @@ -3863,20 +4022,25 @@ SharedData - + novelWriter Project File or Zip File novelWriter project- of zip bestand - + novelWriter Project File novelWriter Projectbestand - + Open Project Project openen + + + Select Font + + VersionInfoWidget @@ -3924,57 +4088,57 @@ _ContentsPage - + Table of Contents Inhoudsopgave - + Title Titel - + Words Woorden - + Pages Pagina's - + Page Pagina - + Progress Voortgang - + Words per page Woorden per pagina - + First page offset Eerste pagina offset - + Chapters on odd pages Hoofdstukken op oneven pagina's - + Untitled Naamloos - + END EINDE @@ -3982,32 +4146,32 @@ _DetailsWidget - + Setting Instelling - + Value Waarde - + Name Naam - + Selection Selectie - + Title Titel - + Hidden Verborgen @@ -4015,37 +4179,37 @@ _FilterTab - + Included in manuscript Opgenomen in manuscript - + Excluded from manuscript Uitgesloten van manuscript - + Always included Altijd opgenomen - + Always excluded Altijd uitgesloten - + Reset to default Herstellen naar standaard - + Mark selection as Markeer selectie als - + Select Root Folders Selecteer hoofd mappen @@ -4053,22 +4217,22 @@ _GuiAlert - + Information Informatie - + Warning Waarschuwing - + Error Foutmelding - + Question Vraag @@ -4076,93 +4240,93 @@ _HeadingsTab - + Hide Verbergen - - + + Editing: {0} Bewerken: {0} - - + + None Geen - + Title Titel - + Chapter Number Hoofdstuknummer - + Chapter Number (Word) Hoofdstuknummer (Word) - + Chapter Number (Upper Case Roman) Hoofdstuk nummer (Romeinse hoofdletters) - + Chapter Number (Lower Case Roman) Hoofdstuk nummer (Romeinse kleine letters) - + Scene Number (In Chapter) Scènenummer (in Hoofdstuk) - + Scene Number (Absolute) Scènenummer (Absoluut) - + Point of View Character Perspectief Karakter - + Focus Character Focus Karakter - + Insert Invoegen - + Apply Toepassen - + Additional Styling Extra opmaak - - - + + + Centre Midden - - - + + + Page Break Nieuwe pagina @@ -4170,117 +4334,117 @@ _NewProjectForm - + Required Vereist - + Optional Optioneel - + Create a fresh project Maak een nieuw project aan - + Create an example project Maak een voorbeeldproject aan - + Copy an existing project Een bestaand project kopiëren - + Project Name Projectnaam - + Author Auteur - + Project Path Project pad - + Prefill Project Vulling Project - + Set to 0 to only add scenes Stel in op 0 om alleen scènes toe te voegen - + Add {0} chapter documents Voeg {0} hoofdstuk documenten toe - + Add {0} scene documents (to each chapter) Voeg {0} scène documenten toe (aan elk hoofdstuk) - + Add a folder for plot notes Voeg een map toe voor plot notities - + Add a folder for character notes Voeg een map toe voor karakter notities - + Add a folder for location notes Voeg een map toe voor locatie notities - + Add example notes to the above Voeg voorbeeld notities toe aan bovenstaand - + Chapters and Scenes Hoofdstukken en scènes - + Project Notes Projectnotities - + Create New Project Nieuw Project Maken - + Select Project Folder Selecteer Projectmap - + Fresh Project Nieuw project - + Example Project Voorbeeld project - + Template: {0} Sjabloon: {0} @@ -4288,7 +4452,7 @@ _NewProjectPage - + A project name is required. Een projectnaam is vereist. @@ -4296,27 +4460,27 @@ _OpenProjectPage - + The project path is not reachable. Project pad is niet bereikbaar. - + Path Pad - + Remove '{0}' from the recent projects list? The project files will not be deleted. '{0}' uit de lijst met recente projecten verwijderen? De project bestanden zullen niet worden verwijderd. - + Open Project Project openen - + Remove Project Project verwijderen @@ -4324,54 +4488,54 @@ _OverviewPage - + Project Project - - + + Name Naam - + Revisions Revisies - + Editing Time Bewerk tijd - - + + Word Count Woord Telling - + In Novels In romans - + In Notes In notities - + Selected Novel Geselecteerde roman - + Chapters Hoofdstukken - + Scenes Scènes @@ -4379,40 +4543,40 @@ _PreviewWidget - + Press the "Preview" button to generate ... Druk op de knop "Preview" om te genereren... - + Processing ... Wordt verwerkt... - + Done Gereed - - Unknown - Onbekend - - - + Built Gebouwd + + + No Preview + + _ProjectListModel - + Word Count Woord Telling - + Last Opened Laatst geopend @@ -4420,77 +4584,77 @@ _ReplacePage - + Text Auto-Replace for Preview and Build Tekst Auto-Vervang voor Preview en Bouwen - + Keyword Sleutelwoord - + Replace With Vervang door - + Select item to edit Selecteer te bewerken item - - Save - Opslaan + + Apply + Toepassen _SettingsPage - + Project name Projectnaam - + Changing this will affect the backup path. Dit veranderen heeft invloed op het pad van de back-up. - + Author(s) Auteur(s) - - + + Only used when building the manuscript. Wordt alleen gebruikt bij het bouwen van het manuscript. - + Project language Project taal - + Default Standaard - + Spell check language Taal voor spellingscontrole - - + + Overrides main preferences. Overschrijft de hoofd voorkeuren. - + Disable backup on close Back-up bij sluiten uitschakelen @@ -4498,59 +4662,59 @@ _StatsWidget - - + + Words Woorden - - + + Characters Tekens - + Words in Headings Woorden in koppen - + Words in Text Woorden in tekst - + Headings Koppen - + Paragraphs Paragrafen - + Characters in Headings Tekens in koppen - + Characters in Text Tekens in tekst - + Characters, No Spaces Tekens, geen spaties - + Characters in Headings, No Spaces Tekens in koppen, geen spaties - + Characters in Text, No Spaces Tekens in tekst, geen spaties @@ -4558,196 +4722,216 @@ _StatusPage - + Novel Document Status Levels Roman Document Status Niveaus - + Project Note Importance Levels Project Notitie Belangrijkheid Niveaus - - Label - Label - - - - Usage - Gebruik - - - - Select item to edit - Selecteer te bewerken item - - - - Colour - Kleur - - - - Save - Opslaan - - - - Select Colour - Selecteer kleur - - - - New Item - Nieuw item - - - - Cannot delete a status item that is in use. - Kan status item dat in gebruik is niet verwijderen. - - - + Not in use Niet in gebruik - + Used once Eenmalig gebruikt - + Used by {0} items Gebruikt door {0} items + + + Select Colour + Selecteer kleur + + + + Label + Label + + + + Usage + Gebruik + + + + Select item to edit + Selecteer te bewerken item + + + + Colour + Kleur + + + + Circles ... + + + + + Bars ... + + + + + Blocks ... + + + + + Shape + + + + + Apply + Toepassen + + + + New Item + Nieuw item + + + + Cannot delete a status item that is in use. + Kan status item dat in gebruik is niet verwijderen. + _TreeContextMenu - + Empty Trash Prullenbak legen - + Rename Hernoemen - + Open Document Document openen - + View Document Bekijk document - + Create New ... Nieuwe aanmaken... - + Rename to Heading Hernoemen naar titel - + Set Active to ... Stel Actief in op... - + Toggle Active Schakel actief - + Set Status to ... Status instellen op ... - - + + Manage Labels ... Labels beheren ... - + Set Importance to ... Belangrijkheid instellen op ... - + Transform ... Transformeren ... - - - - + + + + Convert to {0} Converteer naar {0} - + Merge Child Items into Self Onderliggende items samenvoegen in zelf - + Merge Child Items into New Onderliggende items samenvoegen in nieuw - + Merge Documents in Folder Documenten in Map Samenvoegen - + Split Document by Headings Document splitsen op koppen - + Expand All Alles Uitklappen - + Collapse All Alles Samenvouwen - + Duplicate Dupliceren - - + + Delete Permanently Permanent Verwijderen - - + + Move to Trash Verplaatsen naar Prullenbak - + Move {0} items to Trash? {0} items naar prullenbak verplaatsen? - + Do you want to convert the folder to a {0}? This action cannot be reversed. Wilt u de map converteren naar een {0}? Deze actie kan niet ongedaan worden gemaakt. @@ -4755,7 +4939,7 @@ _UpdatableMenu - + From Template Van sjabloon @@ -4763,12 +4947,12 @@ _ViewPanelBackRefs - + Document Document - + First Heading Eerste titel @@ -4776,27 +4960,27 @@ _ViewPanelKeyWords - + Tag Label - + Importance Belangrijkheid - + Document Document - + Heading Titel - + Short Description Korte beschrijving diff --git a/i18n/nw_pt_BR.ts b/i18n/nw_pt_BR.ts index 0a8686cc..e19e5b5b 100644 --- a/i18n/nw_pt_BR.ts +++ b/i18n/nw_pt_BR.ts @@ -4,232 +4,242 @@ Builds - + Document Filters Filtros de documentos - + Novel Documents Documentos do livro - + Project Notes Notas do projeto - + Inactive Documents Documentos inativos - + Headings Cabeçalhos - + Partition Format Parte - + Chapter Format Capítulo - + Unnumbered Format Capítulo sem número - + Scene Format Cena - + Alt. Scene Format Cena (variação) - + Section Format Seção - + Text Content Conteúdo do texto - + Include Synopsis Incluir sinopse - + Include Comments Incluir comentários - + Include Keywords Incluir palavras-chave - + Include Body Text Incluir corpo do texto - + Ignore These Keywords Ignorar estas palavras-chave - + Insert Content Inserção de conteúdo - + Add Titles for Notes Adicionar títulos às notas - + Text Format Formatação do texto - - - Font Family - Fonte - - - - Font Size - Tamanho da fonte - + Text Font + + + + Line Height Altura da linha - + Text Options Opções de texto - + Justify Text Margins Justificar margens do texto - + Replace Unicode Characters Substituir caracteres unicode - + Replace Tabs with Spaces Substituir tabulações por espaços - - - Page Layout - Layout da página - - Unit - Unidade - - - - Page Size - Tamanho da página - - - - Page Width - Largura da página - - - - Page Height - Altura da página - - - - Top Margin - Margem superior - - - - Bottom Margin - Margem inferior - - - - Left Margin - Margem esquerda - - - - Right Margin - Margem direita - - - - Open Document (.odt) - Open Document (.odt) - - - - Add Highlight Colours - Adicionar cores de destaque - - - - Page Header - Cabeçalho da página - - - - Page Counter Offset - Deslocamento da numeração de página - - - - First Line Indent - Recuo da primeira linha - - - - Markdown (.md) - Markdown (.md) - - - Preserve Hard Line Breaks Manter quebras de linha manuais + + + Apply Dialogue Highlighting + + + + + First Line Indent + Recuo da primeira linha + + + + Enable Indent + + + + + Indent Width + + + + + Indent First Paragraph + + + + + Page Layout + Layout da página + + + + Unit + Unidade + + + + Page Size + Tamanho da página + + + + Page Width + Largura da página + + + + Page Height + Altura da página + + + + Top Margin + Margem superior + + + + Bottom Margin + Margem inferior + + + + Left Margin + Margem esquerda + + + + Right Margin + Margem direita + + Open Document (.odt) + Open Document (.odt) + + + + Add Highlight Colours + Adicionar cores de destaque + + + + Page Header + Cabeçalho da página + + + + Page Counter Offset + Deslocamento da numeração de página + + + HTML (.html) HTML (.html) - + Add CSS Styles Adicionar estilos CSS - + Preserve Tab Characters Manter caracteres de tabulação @@ -237,72 +247,72 @@ Common - + in the future no futuro - + just now agora - + a minute ago um minuto atrás - + {0} minutes ago {0} minutos atrás - + an hour ago uma hora atrás - + {0} hours ago {0} horas atrás - + a day ago um dia atrás - + {0} days ago {0} dias atrás - + a week ago uma semana atrás - + {0} weeks ago {0} semanas atrás - + a month ago um mês atrás - + {0} months ago {0} meses atrás - + a year ago um ano atrás - + {0} years ago {0} anos atrás @@ -310,375 +320,475 @@ Constant - - - + + + None Nenhum - + Novel Livro - - + + Plot Enredo - - + + Characters Personagens - - + + Locations Lugares - - + + Timeline Linha do tempo - - + + Objects Objetos - - + + Entities Entidades - - - + + + Custom Outros - + Archive Arquivados - + Templates Modelos - + Trash Lixeira - - + + Novel Document Documento do livro - - + + Project Note Notas do projeto - + Root Folder Diretório-raiz - + Folder Diretório - + Novel Title Page Folha de rosto do livro - + Novel Chapter Capítulo do livro - + Novel Scene Cena do livro - + Novel Section Seção do livro - + Tag Etiqueta - + Point of View Ponto de vista - - + + Focus Foco - + Title Título - + Level Nível - + Document Documento - + Line Linha - + Chars Caracteres - + Words Palavras - + Pars Parágrafos - + POV Ponto de vista - + Synopsis Sinopse - + Open Document (.odt) Open Document (.odt) - + Flat Open Document (.fodt) Flat Open Document (.fodt) - + novelWriter HTML (.html) HTML do novelWriter (.htm) - + novelWriter Markup (.txt) Markup do novelWriter (.txt) - + Standard Markdown (.md) Markdown padrão (.md) - + Extended Markdown (.md) Markdown estendido (.md) - + JSON + novelWriter HTML (.json) JSON + HTML do novelWriter (.json) - + JSON + novelWriter Markup (.json) JSON + Markup do novelWriter (.json) + + + Square + + + + + Triangle + + + + + Nabla + + + + + Diamond + + + + + Pentagon + + + + + Hexagon + + + Star + + + + + Pacman + + + + + 1/4 Circle + + + + + Half Circle + + + + + 3/4 Circle + + + + + Full Circle + + + + + 1 Bar + + + + + 2 Bars + + + + + 3 Bars + + + + + 4 Bars + + + + + 1 Block + + + + + 2 Blocks + + + + + 3 Blocks + + + + + 4 Blocks + + + + Text files Arquivos de texto - + Markdown files Arquivos Markdown - + novelWriter files Arquivos do novelWriter - + CSV files Arquivos CSV - + All files Todos os arquivos - + Millimetres Milímetros - + Centimetres Centímetros - + Inches Polegadas - + A4 A4 - + A5 A5 - + A6 A6 - + US Legal Ofício - + US Letter Carta - + Straight single quotation mark Aspas simples retas - + Straight double quotation mark Aspas duplas retas - + Left single quotation mark Aspas simples à esquerda - + Right single quotation mark Aspas simples à direita - + Single low-9 quotation mark Aspas 9-baixo simples - + Single high-reversed-9 quotation mark Aspas 9-alto-invertido simples - + Left double quotation mark Aspas duplas à esquerda - + Right double quotation mark Aspas duplas à direita - + Double low-9 quotation mark Aspas 9-baixo duplas - + Double high-reversed-9 quotation mark Aspas 9-alto-invertido duplas - + Double low-reversed-9 quotation mark Aspas 9-baixo-invertido duplas - + Single left-pointing angle quotation mark Aspas angulares simples à esquerda - + Single right-pointing angle quotation mark Aspas angulares simples à direita - + Double left-pointing angle quotation mark Aspas angulares duplas apontando à esquerda - + Double right-pointing angle quotation mark Aspas angulares duplas apontando à direita - + Left corner bracket Colchete de canto à esquerda - + Right corner bracket Right corner bracket - + Left white corner bracket Colchete branco de canto à esquerda - + Right white corner bracket Colchete branco de canto à direita @@ -704,38 +814,38 @@ GuiBuildSettings - - + + Manuscript Build Settings Opções de compilação do manuscrito - + Name Nome - + Selection Seleção - + Headings Cabeçalhos - + Content Conteúdo - + Format Formatação - + Output Saída @@ -783,7 +893,7 @@ Não foi possível processar o arquivo do dicionário - + Added: {0} [{1}B] Adicionado: {0} [{1}B] @@ -791,22 +901,22 @@ GuiDocEditFooter - + Line: {0} ({1}) Linha: {0} ({1}) - + Words: {0} ({1}) Palavras: {0} ({1}) - + Words: {0} selected Palavras: {0} selecionadas - + Status Estado @@ -814,27 +924,27 @@ GuiDocEditHeader - + Toggle Tool Bar Exibir/ocultar barra de ferramentas - + Outline Estrutura - + Search Pesquisa - + Toggle Focus Mode Alternar o modo de foco - + Close Fechar @@ -842,62 +952,62 @@ GuiDocEditSearch - + Search for Pesquisar por - + Replace with Substituir por - + Search Pesquisa - + Case Sensitive Diferenciar maiúsculas e minúsculas - + Whole Words Only Apenas palavras inteiras - + RegEx Mode Expressão regular - + Loop Search Pesquisa iterativa - + Search Next File Pesquisar no documento seguinte - + Preserve Case Preservar maiúsculas e minúsculas - + Close Search Fechar pesquisa - + Find in current document Encontrar no documento atual - + Find and replace in current document Encontrar e substituir no documento atual @@ -905,122 +1015,122 @@ GuiDocEditor - + Opened Document: {0} Documento aberto: {0} - + This document has been changed outside of novelWriter while it was open. Overwrite the file on disk? Este documento foi alterado fora do novelWriter enquanto estava aberto. Sobrescrever o arquivo no disco? - + Could not save document. Não foi possível salvar o documento. - + Saved Document: {0} Documento salvo: {0} - + Spell checking requires the package PyEnchant. It does not appear to be installed. A verificação ortográfica requer o pacote PyEnchant. Ele não parece estar instalado. - + Spell check complete Verificação ortográfica concluída - + Document Details Detalhes do documento - + Created: {0} Criado em: {0} - + Updated: {0} Atualizado em: {0} - + File Location: {0} Caminho do arquivo: {0} - + Set as Document Name Definir como nome do documento - + Follow Tag Seguir etiqueta - + Create Note for Tag Criar nota para a etiqueta - + Cut Recortar - + Copy Copiar - + Paste Colar - + Select All Selecionar tudo - + Select Word Selecionar palavra - + Select Paragraph Selecionar parágrafo - + Spelling Suggestion(s) Sugestão(ões) de ortografia - + No Suggestions Sem sugestões - + Add Word to Dictionary Adicionar palavra ao dicionário - + Please select some text before calling replace quotes. Por favor, selecione algum texto antes de usar a substituição de aspas. - + Do you want to create a new project note for the tag '{0}'? Deseja criar uma nova nota de projeto para a etiqueta '{0}'? @@ -1104,52 +1214,52 @@ GuiDocToolBar - + Markdown Bold Negrito (em Markdown) - + Markdown Italic Itálico (em Markdown) - + Markdown Strikethrough Tachado (em Markdown) - + Shortcode Bold Atalho Negrito - + Shortcode Italic Atalho Itálico - + Shortcode Strikethrough Atalho Riscado - + Shortcode Underline Atalho Sublinhado - + Shortcode Highlight Destaque (em código) - + Shortcode Superscript Atalho Sobrescrito - + Shortcode Subscript Atalho Subescrito @@ -1157,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel Exibir/ocultar painel de visualização - + Comments Comentários - + Show Comments Exibir comentários - + Synopsis Sinopse - + Show Synopsis Comments Exibir comentários de sinopse @@ -1185,27 +1295,27 @@ GuiDocViewHeader - + Outline Estrutura - + Go Backward Voltar - + Go Forward Avançar - + Reload Recarregar - + Close Fechar @@ -1213,27 +1323,27 @@ GuiDocViewer - + An error occurred while generating the preview. Ocorreu um erro ao gerar a pré-visualização. - + Copy Copiar - + Select All Selecionar tudo - + Select Word Selecionar palavra - + Select Paragraph Selecionar parágrafo @@ -1254,12 +1364,12 @@ GuiEditLabel - + Item Label Rótulo do item - + Label Rótulo @@ -1267,37 +1377,37 @@ GuiItemDetails - + Label Rótulo - + Status Estado - + Class Classe - + Usage Uso - + Characters Caracteres - + Words Palavras - + Paragraphs Parágrafos @@ -1305,27 +1415,27 @@ GuiLipsum - + Insert Placeholder Text Inserir texto de preenchimento - + Insert Lorem Ipsum Text Inserir texto fictício (Lorem Ipsum) - + Number of paragraphs Quantidade de parágrafos - + Randomise order Ordem aleatória - + Insert Inserir @@ -1333,78 +1443,78 @@ GuiMain - + novelWriter is ready ... novelWriter está pronto ... - + You are now running novelWriter version {0}. Você está executando a versão {0} do novelWriter. - + Please check the {0}release notes{1} for further details. Por favor, verifique as {0}notas da versão{1} para mais detalhes. - + Close the current project? Fechar o projeto atual? - - + + Changes are saved automatically. Alterações são salvas automaticamente. - + Backup the current project? Criar cópia de segurança do projeto atual? - + The project is already open by another instance of novelWriter, and is therefore locked. Override lock and continue anyway? O projeto já está aberto em outra instância do novelWriter, e portanto foi bloqueado. Deseja sobrescrever o bloqueio e continuar mesmo assim? - + 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. Nota: se o programa ou o computador travaram anteriormente, o bloqueio pode ser substituído com segurança. No entanto, sobrescrevê-lo não é recomendado se o projeto estiver aberto em outra instância do novelWriter. Fazer isso pode corromper o projeto. - + The project was locked by the computer '{0}' ({1} {2}), last active on {3}. O projeto foi bloqueado pelo computador '{0}' ({1} {2}), ativo pela última vez em {3}. - + The project index is outdated or broken. Rebuilding index. O índice do projeto está desatualizado ou quebrado. Reconstruindo o índice. - + Import File Importar arquivo - + Could not read file. The file must be an existing text file. Não foi possível ler o arquivo. O arquivo deve ser um arquivo de texto existente. - + Please open a document to import the text file into. Por favor, abra o documento no qual deseja importar o texto. - + Importing the file will overwrite the current content of the document. Do you want to proceed? Importar o arquivo vai sobrescrever o conteúdo atual do documento. Deseja continuar? - + Indexing completed in {0} ms Indexação completa em {0} ms @@ -1414,22 +1524,22 @@ O índice do projeto foi reconstruído com sucesso. - + Could not initialise the dialog. Não foi possível inicializar a caixa de diálogo. - + Do you want to exit novelWriter? Deseja sair do novelWriter? - + Some changes will not be applied until novelWriter has been restarted. Algumas alterações não serão aplicadas enquanto o novelWriter não for reiniciado. - + 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}. Não foi possível encontrar a referência para a etiqueta '{0}'. Pode ser que ela não exista ou que o índice esteja desatualizado. O índice pode ser atualizado a partir do menu Ferramentas ou pressionando {1}. @@ -1573,13 +1683,13 @@ - Go to Project Tree - Ir para a árvore do projeto + Go to Tree View + - Go to Document Editor - Ir para o editor de documentos + Go to Document + @@ -1797,297 +1907,302 @@ Texto de preenchimento - + + Footnote + + + + &Format &Formatar - + Bold Negrito - + Italic Itálico - + Strikethrough Tachado - + Wrap Double Quotes Aspas duplas - + Wrap Single Quotes Aspas simples - + More Formats ... Mais formatos... - + Bold (Shortcode) Negrito (código) - + Italics (Shortcode) Itálico (código) - + Strikethrough (Shortcode) Tachado (código) - + Underline Sublinhado - + Highlight Destaque - + Superscript Sobrescrito - + Subscript Subscrito - + Heading 1 (Partition) Cabeçalho 1 (parte) - + Heading 2 (Chapter) Cabeçalho 2 (capítulo) - + Heading 3 (Scene) Cabeçalho 3 (cena) - + Heading 4 (Section) Cabeçalho 4 (seção) - + Novel Title Título do livro - + Unnumbered Chapter Capítulo sem número - + Alternative Scene Cena (variação) - + Align Left Alinhar à esquerda - + Align Centre Centralizar - + Align Right Alinhar à direita - + Indent Left Recuo à esquerda - + Indent Right Recuo à direita - + Toggle Comment Ativar/desativar comentário - + Toggle Ignore Text Ativar/desativar texto ignorado - + Remove Block Format Limpar formatação do bloco - + Replace Straight Single Quotes Substituir aspas retas simples - + Replace Straight Double Quotes Substituir aspas retas duplas - + Remove In-Paragraph Breaks Remover quebras no parágrafo - + &Search Pe&squisa - + Find Procurar - + Replace Substituir - + Find Next Procurar seguinte - + Find Previous Procurar anterior - + Replace Next Substituir seguinte - + Find in Project Procurar no projeto - + &Tools Ferramen&tas - + Check Spelling Verificar ortografia - + Spell Check Language Idioma da verificação ortográfica - + Default Padrão - + Re-Run Spell Check Refazer verificação ortográfica - + Project Word List Lista de palavras do projeto - + Add Dictionaries Adicionar dicionários - + Rebuild Index Reconstruir índice - + Backup Project Cópia de segurança do projeto - + Build Manuscript Compilar manuscrito - + Writing Statistics Estatísticas de escrita - + Preferences Preferências - + &Help A&juda - + About novelWriter Sobre o novelWriter - + About Qt5 Sobre o Qt5 - + User Manual (Online) Manual do usuário (online) - + User Manual (PDF) Manual do usuário (PDF) - + Report an Issue (GitHub) Reportar um problema (Github) - + Ask a Question (GitHub) Fazer uma pergunta (Github) - + The novelWriter Website Página web do novelWriter @@ -2096,22 +2211,22 @@ GuiMainStatus - + None Nenhum - + Editor Editor - + Project Projeto - + Session Time Duração da sessão @@ -2134,63 +2249,63 @@ GuiManuscript - + Build Manuscript Compilar manuscrito - + Add New Build Adicionar uma nova compilação - + Delete Selected Build Excluir a compilação selecionada - + Edit Selected Build Editar a compilação selecionada - + Builds Compilações - + Details Detalhes - + Outline Estrutura - + Preview Pré-visualização - + Print Imprimir - + Build Compilar - + Close Fechar - - + + My Manuscript Meu manuscrito @@ -2256,18 +2371,18 @@ GuiNovelDetails - - + + Novel Details Detalhes do livro - + Overview Visão geral - + Contents Conteúdo @@ -2275,58 +2390,58 @@ GuiNovelToolBar - + Outline of {0} Estrutura de {0} - + Novel Root Raiz do livro - + Refresh Atualizar - + Last Column Última coluna - + Hidden Ocultar - + Point of View Character Personagem do ponto de vista - + Focus Character Personagem em foco - + Novel Plot Enredo do livro - - + + Column Size Tamanho da coluna - + More Options Mais opções - + Maximum column size in % Tamanho máximo da coluna em % @@ -2334,7 +2449,7 @@ GuiNovelTree - + No meta data Sem metadados @@ -2342,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title Título - + Chapter Capítulo - + Scene Cena - + Section Seção - + Document Documento - + Status Estado - + Characters Caracteres - + Words Palavras - + Paragraphs Parágrafos - + Synopsis Sinopse - + Title Details Detalhes do título - + Reference Tags Etiquetas de referência @@ -2407,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns Selecionar colunas @@ -2415,17 +2530,17 @@ GuiOutlineToolBar - + Outline of Estrutura de - + Refresh Atualizar - + Export CSV Exportar CSV @@ -2433,7 +2548,7 @@ GuiOutlineTree - + Save Outline As Salvar estrutura como @@ -2441,553 +2556,589 @@ GuiPreferences - - + + Preferences Preferências - + Search Pesquisa - + General Geral - + Appearance Aparência - + Display language Idioma - - - + + Requires restart to take effect. É necessário reiniciar para ter efeito. - + Colour theme Tema do programa - + General colour theme and icons. Tema de cores e ícones gerais. - - Application font family - Fonte do programa + + Application font + - - Application font size - Tamanho da fonte do programa - - - - - pt - pt - - - + Hide vertical scroll bars in main windows Ocultar a barra de rolagem vertical nas janelas principais - - + + Scrolling available with mouse wheel and keys only. Rolagem disponível apenas com a roda do mouse ou teclado. - + Hide horizontal scroll bars in main windows Ocultar a barra de rolagem horizontal nas janelas principais + + + Use the system's font selection dialog + + + Turn off to use the Qt font dialog, which may have more options. + + + + Document Style Estilo do documento - + Document colour theme Tema de cores do documento - + Colour theme for the editor and viewer. Tema de cores do editor e da visualização. - - Document font family - Fonte do documento + + Document font + - - - - + + + Applies to both document editor and viewer. Aplica-se ao editor à visualização de documentos. - - Document font size - Tamanho da fonte do documento - - - + Emphasise partition and chapter labels Destacar rótulos de partes e capítulos - + Makes them stand out in the project tree. Faz com que eles se destaquem na árvore do projeto. - + Show full path in document header Mostrar caminho completo no cabeçalho - + Add the parent folder names to the header. Inclui o nome dos diretórios superiores no cabeçalho do documento. - + Include project notes in status bar word count Incluir as notas do projeto na contagem de palavras - + Auto Save Salvamento automático - + Save document interval Intervalo de salvamento do documento - + How often the document is automatically saved. Com qual frequência o documento é salvo automaticamente. - - + + seconds segundos - + Save project interval Intervalo de salvamento do projeto - + How often the project is automatically saved. Com qual frequência o projeto é salvo automaticamente. - + Project Backup Cópia de segurança - + Browse Explorar - + Backup storage location Local da cópia de segurança - - + + Path: {0} Caminho: {0} - + Run backup when the project is closed Criar cópia de segurança quando o projeto é fechado - + Can be overridden for individual projects in Project Settings. Pode ser sobrescrito por projeto individual nas configurações do projeto. - + Ask before running backup Perguntar antes de criar cópia de segurança - + If off, backups will run in the background. Se desativado, cópias de segurança serão criadas em segundo plano. - + Session Timer Temporizador de sessão - + Pause the session timer when not writing Pausar o temporizador de sessão quando não estiver escrevendo - + Also pauses when the application window does not have focus. Também pausa quando a janela do programa não estiver em foco. - + Editor inactive time before pausing timer Tempo de inatividade do editor antes de pausar o temporizador - + User activity includes typing and changing the content. Atividades de usuário incluem digitar e modificar o conteúdo. - + minutes minutos - + Writing Escrita - + Text Flow Fluxo do texto - + Maximum text width in "Normal Mode" Largura máxima do texto no "Modo Normal" - + Set to 0 to disable this feature. Use 0 para desativar esta função. - - - - + + + + px px - + Maximum text width in "Focus Mode" Largura máxima do texto no "Modo Foco" - + The maximum width cannot be disabled. A largura máxima não pode ser desativada. - + Hide document footer in "Focus Mode" Ocultar o rodapé do documento no "Modo Foco" - + Hide the information bar in the document editor. Ocultar a barra de informações do editor de documentos. - + Justify the text margins Justificar as margens do texto - + Minimum text margin Margem de texto mínima - + Tab width Largura da tabulação - + The width of a tab key press in the editor and viewer. Largura da tabulação no editor e visualizador. - + Text Editing Edição de texto - + Spell check language Idioma da verificação ortográfica - + Available languages are determined by your system. Os idiomas disponíveis são determinados pelo seu sistema. - + Auto-select word under cursor Selecionar automaticamente a palavra sob o cursor - + Apply formatting to word under cursor if no selection is made. Aplicar a formatação à palavra sob o cursor se nenhuma seleção for feita. - + Show tabs and spaces Mostrar tabulações e espaços - + Show line endings Mostrar terminações de linha - + Editor Scrolling Rolagem do editor - + Scroll past end of the document Rolar após o final do documento - + Also centres the cursor when scrolling. Também centraliza o cursor ao rolar. - + Typewriter style scrolling when you type Rolagem no estilo de máquina de escrever ao digitar - + Keeps the cursor at a fixed vertical position. Mantém o cursor em uma posição vertical fixa. - + Minimum position for Typewriter scrolling Posição mínima para a rolagem de máquina de escrever - + Percentage of the editor height from the top. Porcentagem da altura do editor desde o topo. - + Text Highlighting Destaque de texto - - Highlight text wrapped in quotes - Destacar o texto em citações + + None + Nenhum - - - - Applies to the document editor only. - Aplica-se apenas para o editor de documentos. + + Single Quotes + + + + + Double Quotes + + + + + Both + + + + + Highlight dialogue + + + + + Applies to the selected quote styles. + + + + + Allow open-ended dialogue + - Allow open-ended single quotes - Permitir citações com aspas simples sem fechamento + Highlight dialogue line with no closing quote. + - - Highlight single-quoted line with no closing quote. - Destaca a linha com citação de aspas simples sem aspas de fechamento. + + Dialogue narrator break symbol + - - Allow open-ended double quotes - Permitir citações com aspas duplas sem fechamento + + Symbol to indicate injected narrator break. + - - Highlight double-quoted line with no closing quote. - Destaca a linha com citação de aspas duplas sem aspas de fechamento. + + Dialogue line symbol + - + + Lines starting with this symbol are dialogue. + + + + + Alternative dialogue symbols + + + + + Custom highlighting of dialogue text. + + + + Add highlight colour to emphasised text Adicionar cor de destaque ao texto enfatizado - + + + Applies to the document editor only. + Aplica-se apenas para o editor de documentos. + + + Highlight multiple or trailing spaces Destacar espaços múltiplos ou finais - + Text Automation Substituição ao digitar - + Auto-replace text as you type Substituir automaticamente o texto ao digitar - + Allow the editor to replace symbols as you type. Permite que o editor substitua símbolos conforme você digita. - + Auto-replace single quotes Substituir aspas simples automaticamente - - + + Try to guess which is an opening or a closing quote. Tenta adivinhar se a aspa é de abertura ou de fechamento. - + Auto-replace double quotes Substituir aspas duplas automaticamente - + Auto-replace dashes Substituir travessões automaticamente - + Double and triple hyphens become short and long dashes. Hífens duplos ou triplos são substituídos por travessões curtos (en dash) ou longos (em dash). - + Auto-replace dots Substituir pontos automaticamente - + Three consecutive dots become ellipsis. Três pontos consecutivos são substituídos por reticências. - + Insert non-breaking space before Inserir espaço não-separável antes de - + Automatically add space before any of these symbols. Adiciona automaticamente um espaço não-separável antes de cada um desses símbolos. - + Insert non-breaking space after Inserir espaço não-separável após - + Automatically add space after any of these symbols. Adiciona automaticamente um espaço não-separável após cada um desses símbolos. - + Use thin space instead Usar espaço estreito - + Inserts a thin space instead of a regular space. Insere um espaço estreito em vez de um espaço regular. - + Quotation Style Estilo de aspas - + Single quote open style Estilo da aspa de abertura simples - + The symbol to use for a leading single quote. Símbolo usado para a aspa simples à esquerda. - + Single quote close style Estilo da aspa de fechamento simples - + The symbol to use for a trailing single quote. Símbolo usado para a aspa simples à direita. - + Double quote open style Estilo da aspa de abertura dupla - + The symbol to use for a leading double quote. Símbolo usado para a aspa dupla à esquerda. - + Double quote close style Estilo da aspa de fechamento dupla - + The symbol to use for a trailing double quote. Símbolo usado para a aspa dupla à direita. - + Backup Directory Diretório da cópia de segurança @@ -3023,28 +3174,28 @@ GuiProjectSettings - - + + Project Settings Configurações do projeto - + Settings Configurações - + Status Estado - + Importance Importância - + Auto-Replace Substituição automática @@ -3052,47 +3203,47 @@ GuiProjectToolBar - + Project Content Conteúdo do projeto - + Quick Links Ligações rápidas - + Move Up Mover para cima - + Move Down Mover para baixo - + Add Item Adicionar item - + Expand All Expandir tudo - + Collapse All Recolher tudo - + Empty Trash Esvaziar a lixeira - + More Options Mais opções @@ -3100,122 +3251,130 @@ GuiProjectTree - + Active Ativo - + Inactive Inativo - + Permanently delete {0} file(s) from Trash? Permanentemente remover {0} arquivo(s) da lixeira? - + Did not find anywhere to add the file or folder! Não foi possível encontrar nenhum lugar para adicionar o arquivo ou diretório! - + Cannot add new files or folders to the Trash folder. Não é possível adicionar novos arquivos ou diretórios à lixeira. - + New Note Nova nota - + New Chapter Novo capítulo - + New Scene Nova cena - + New Document Novo documento - + New Folder Novo diretório - + There is currently no Trash folder in this project. Não existe um diretório de lixeira neste projeto. - + The Trash folder is already empty. O diretório da lixeira já está vazio. - + Move '{0}' to Trash? Mover '{0}' para a lixeira? - + Root folders can only be deleted when they are empty. Os diretórios-raiz só podem ser excluídos quando estiverem vazios. - + Permanently delete '{0}'? Excluir permanentemente '{0}? - + Drag and drop is only allowed for single items, non-root items, or multiple items with the same parent. Arrastar e soltar é permitido apenas para itens únicos, itens que não sejam raiz ou itens múltiplos com o mesmo pai. - + No documents selected for merging. Nenhum documento selecionado para combinar. - + Merged Combinado - - + + Could not write document content. Não foi possível escrever o conteúdo do documento. - + Do you want to duplicate this document? Deseja duplicar este documento? - + Do you want to duplicate this item and all child items? Deseja duplicar este item e todos seus subitens? - + Could not duplicate all items. Não foi possível duplicar todos os itens. - + There is nowhere to add item with name '{0}'. Não há lugar para adicionar o item com o nome '{0}'. + + GuiQuoteSelect + + + Select Quote Style + + + GuiSideBar @@ -3300,33 +3459,33 @@ GuiWordList - - + + Project Word List Lista de palavras do projeto - + Import words from text file Importar palavras de um arquivo de texto - + Export words to text file Exportar palavras para arquivo de texto - + Note: The import file must be a plain text file with UTF-8 or ASCII encoding. Nota: o arquivo a ser importado deve ser um arquivo de texto simples com codificação UTF-8 ou ASCII. - + Import File Importar arquivo - + Export File Exportar arquivo @@ -3334,147 +3493,147 @@ GuiWritingStats - + Writing Statistics Estatísticas de escrita - + Session Start Início da sessão - + Length Duração - + Idle Inatividade - + Words Palavras - + Histogram Histograma - + Sum Totals Soma dos totais - + Total Time: Tempo total: - + Idle Time: Tempo de inatividade: - + Filtered Time: Tempo filtrado: - + Novel Word Count: Contagem de palavras do livro: - + Notes Word Count: Contagem de palavras das notas: - + Total Word Count: Contagem total de palavras: - + Filters Filtros - + Count novel files Contar documentos do livro - + Count note files Contar documentos de notas - + Hide zero word count Ocultar contagem zerada de palavras - + Hide negative word count Ocultar contagem negativa de palavras - + Group entries by day Agrupar entradas por dia - + Show idle time Mostrar tempo de inatividade - + Word count cap for the histogram Limite de quantidade de palavras no histograma - + Save As Salvar como - + JSON Data File (.json) Arquivo de dados JSON (.json) - + CSV Data File (.csv) Arquivo de dados CSV (.csv) - + JSON Data File Arquivo de dados JSON - + CSV Data File Arquivo de dados CSV - + Save Data As Salvar dados como - + {0} file successfully written to: Arquivo {0} escrito com sucesso em: - + Failed to write {0} file. Falha ao escrever o arquivo {0}. @@ -3482,153 +3641,153 @@ NWProject - + Could not delete document file. Não foi possível excluir o arquivo do documento. - + Not a known project file format. Não é um formato conhecido de arquivo de projeto. - + Project file not found. Arquivo de projeto não encontrado. - + Failed to open project. Falha ao abrir projeto. - + Unknown Desconhecido - + Project file does not appear to be a novelWriterXML file. O arquivo do projeto não parece ser um arquivo XML do novelWriter. - + 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}. Formato de arquivo de projeto do novelWriter desconhecido ou não-suportado. O projeto não pode ser aberto por essa versão do novelWriter. O arquivo foi salvo com a versão {0} do novelWriter. - + Failed to parse project xml. Houve uma falha ao interpretar o conteúdo XML do projeto. - + 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? O formato do arquivo do seu projeto está prestes a ser atualizado. Se você continuar, as versões mais antigas do novelWriter não poderão mais abrir este projeto. Continuar? - + 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? O projeto foi salvo por uma versão mais nova do novelWriter, versão {0}. Esta é a versão {1}. Caso deseje abrir o projeto, alguns atributos e configurações podem não ser preservados, mas o projeto deve funcionar corretamente. Continuar? - + Recovered Recuperado - + Found {0} orphaned file(s) in the project. {1} file(s) were recovered. Encontrado(s) {0} arquivo(s) órfão(s) no projeto. {1} arquivo(s) recuperado(s). - + Opened Project: {0} Projeto aberto: {0} - + There is no project open. Não há um projeto aberto. - + Failed to save project. Houve uma falha ao salvar o projeto. - + Saved Project: {0} Projeto salvo: {0} - + Backing up project ... Criando uma cópia de segurança do projeto... - + Cannot backup project because no project name is set. Please set a Project Name in Project Settings. Não foi possível criar a cópia de segurança do projeto porque o nome do projeto não está definido. Por favor, defina-o nas configurações do projeto. - + Could not create backup folder. Não foi possível criar o diretório da cópia de segurança. - + Created a backup of your project of size {0}B. Foi criado uma cópia de segurança do seu projeto com {0}B de tamanho. - + Path: {0} Caminho: {0} - + Could not write backup archive. Não foi possível escrever o arquivo da cópia de segurança. - + Project backed up to '{0}' Cópia de segurança do projeto criada em '{0}' - - + + New Novo - + Note Nota - + Draft Rascunho - + Finished Finalizado - + Minor Menor - + Major Maior - + Main Principal @@ -3644,89 +3803,89 @@ ProjectBuilder - + The target folder is not empty. Please choose another folder. A pasta de destino não está vazia. Por favor, escolha outra pasta. - + An error occurred while trying to create the project. Ocorreu um erro durante a criação o projeto. - + New Project Novo projeto - + Title Page Folha de rosto - + By Por - + Summary of the chapter. Resumo do capítulo. - + Summary of the scene. Resumo da cena. - + A short description. Uma breve descrição. - + Chapter {0} Capítulo {0} - - + + Scene {0} Cena {0} - + Main Plot Enredo principal - + Protagonist Protagonista - + Main Location Local principal - - + + The target folder already exists. Please choose another folder. A pasta de destino já existe. Por favor, escolha outra pasta. - + Could not copy project files. Não foi possível copiar os arquivos do projeto. - + Failed to create a new example project. Houve uma falha ao criar um novo projeto de exemplo. - + Failed to create a new example project. Could not find the necessary files. They seem to be missing from this installation. Houve uma falha ao criar um novo projeto de exemplo. Não foi possível encontrar os arquivos necessários. Eles parecem estar faltando nesta instalação. @@ -3863,20 +4022,25 @@ SharedData - + novelWriter Project File or Zip File Arquivo de projeto do novelWriter ou arquivo Zip - + novelWriter Project File Arquivo do projeto novelWriter - + Open Project Abrir projeto + + + Select Font + + VersionInfoWidget @@ -3924,57 +4088,57 @@ _ContentsPage - + Table of Contents Sumário - + Title Título - + Words Palavras - + Pages Páginas - + Page Página - + Progress Progresso - + Words per page Palavras por página - + First page offset Deslocamento da primeira página - + Chapters on odd pages Capítulos em páginas ímpares - + Untitled Sem título - + END FIM @@ -3982,32 +4146,32 @@ _DetailsWidget - + Setting Definição - + Value Valor - + Name Nome - + Selection Seleção - + Title Título - + Hidden Oculto @@ -4015,37 +4179,37 @@ _FilterTab - + Included in manuscript Incluído no manuscrito - + Excluded from manuscript Excluído do manuscrito - + Always included Sempre incluído - + Always excluded Sempre excluído - + Reset to default Restaurar predefinição - + Mark selection as Definir seleção como - + Select Root Folders Selecionar diretórios-raiz @@ -4053,22 +4217,22 @@ _GuiAlert - + Information Informação - + Warning Alerta - + Error Erro - + Question Pergunta @@ -4076,93 +4240,93 @@ _HeadingsTab - + Hide Ocultar - - + + Editing: {0} Editando: {0} - - + + None Nenhum - + Title Título - + Chapter Number Número do capítulo - + Chapter Number (Word) Número do capítulo (por extenso) - + Chapter Number (Upper Case Roman) Número do capítulo (numeral romano, maiúsculas) - + Chapter Number (Lower Case Roman) Número do capítulo (numeral romano, minúsculas) - + Scene Number (In Chapter) Número da cena (no capítulo) - + Scene Number (Absolute) Número da cena (absoluto) - + Point of View Character Personagem do ponto de vista - + Focus Character Personagem em foco - + Insert Inserir - + Apply Aplicar - + Additional Styling Elementos de estilo adicionais - - - + + + Centre Centralizado - - - + + + Page Break Quebra de página @@ -4170,117 +4334,117 @@ _NewProjectForm - + Required Obrigatório - + Optional Opcional - + Create a fresh project Criar um projeto vazio - + Create an example project Criar um projeto de exemplo - + Copy an existing project Copiar um projeto existente - + Project Name Nome do projeto - + Author Autor - + Project Path Caminho do projeto - + Prefill Project Pré-preencher projeto - + Set to 0 to only add scenes Defina como 0 para adicionar apenas cenas - + Add {0} chapter documents Adicionar {0} documentos de capítulo - + Add {0} scene documents (to each chapter) Adicionar {0} documentos de cena (por capítulo) - + Add a folder for plot notes Adicionar um diretório para notas de enredo - + Add a folder for character notes Adicionar um diretório para notas de personagens - + Add a folder for location notes Adicionar um diretório para notas de local - + Add example notes to the above Adicionar notas de exemplo aos itens acima - + Chapters and Scenes Capítulos e cenas - + Project Notes Notas do projeto - + Create New Project Criar um novo projeto - + Select Project Folder Selecione o diretório do projeto - + Fresh Project Projeto vazio - + Example Project Projeto de exemplo - + Template: {0} Modelo: {0} @@ -4288,7 +4452,7 @@ _NewProjectPage - + A project name is required. O nome do projeto é obrigatório. @@ -4296,27 +4460,27 @@ _OpenProjectPage - + The project path is not reachable. O caminho do projeto não pode ser acessado. - + Path Caminho - + Remove '{0}' from the recent projects list? The project files will not be deleted. Remover '{0}' da lista de projetos recentes? Os arquivos do projeto não serão excluídos. - + Open Project Abrir projeto - + Remove Project Remover projeto @@ -4324,54 +4488,54 @@ _OverviewPage - + Project Projeto - - + + Name Nome - + Revisions Revisões - + Editing Time Tempo de edição - - + + Word Count Contagem de palavras - + In Novels em livros - + In Notes nas notas - + Selected Novel Livro selecionado - + Chapters Capítulos - + Scenes Cenas @@ -4379,40 +4543,40 @@ _PreviewWidget - + Press the "Preview" button to generate ... Clique em "Pré-visualização" para gerá-la ... - + Processing ... Processando ... - + Done Pronto - - Unknown - Desconhecido - - - + Built Criado + + + No Preview + + _ProjectListModel - + Word Count Contagem de palavras - + Last Opened Aberto pela última vez em @@ -4420,77 +4584,77 @@ _ReplacePage - + Text Auto-Replace for Preview and Build Substituição automática de texto para a pré-visualização e compilação - + Keyword Palavra-chave - + Replace With Substituir por - + Select item to edit Selecione um item para editar - - Save - Salvar + + Apply + Aplicar _SettingsPage - + Project name Nome do projeto - + Changing this will affect the backup path. Alterar isso afetará o caminho da cópia de segurança. - + Author(s) Autor(es) - - + + Only used when building the manuscript. Usado apenas na compilação do manuscrito. - + Project language Idioma do projeto - + Default Padrão - + Spell check language Idioma da verificação ortográfica - - + + Overrides main preferences. Sobrescreve as preferências globais. - + Disable backup on close Desativar criação de cópia de segurança ao fechar @@ -4498,59 +4662,59 @@ _StatsWidget - - + + Words Palavras - - + + Characters Caracteres - + Words in Headings Palavras em cabeçalhos - + Words in Text Palavras no texto - + Headings Cabeçalhos - + Paragraphs Parágrafos - + Characters in Headings Caracteres em cabeçalhos - + Characters in Text Caracteres no texto - + Characters, No Spaces Caracteres, sem espaços - + Characters in Headings, No Spaces Caracteres em cabeçalhos, sem espaços - + Characters in Text, No Spaces Caracteres no texto, sem espaços @@ -4558,196 +4722,216 @@ _StatusPage - + Novel Document Status Levels Níveis de estado nos documentos do livro - + Project Note Importance Levels Níveis de importância nas notas do projeto - - Label - Rótulo - - - - Usage - Uso - - - - Select item to edit - Selecione um item para editar - - - - Colour - Cor - - - - Save - Salvar - - - - Select Colour - Selecione uma cor - - - - New Item - Novo item - - - - Cannot delete a status item that is in use. - Não é possível remover um item de estado em uso. - - - + Not in use Não usado - + Used once Usado uma vez - + Used by {0} items Usado por {0} items + + + Select Colour + Selecione uma cor + + + + Label + Rótulo + + + + Usage + Uso + + + + Select item to edit + Selecione um item para editar + + + + Colour + Cor + + + + Circles ... + + + + + Bars ... + + + + + Blocks ... + + + + + Shape + + + + + Apply + Aplicar + + + + New Item + Novo item + + + + Cannot delete a status item that is in use. + Não é possível remover um item de estado em uso. + _TreeContextMenu - + Empty Trash Esvaziar a lixeira - + Rename Renomear - + Open Document Abrir documento - + View Document Ver documento - + Create New ... Criar novo ... - + Rename to Heading Renomear para título - + Set Active to ... Definir inclusão como... - + Toggle Active Alternar inclusão - + Set Status to ... Definir estado como... - - + + Manage Labels ... Gerenciar rótulos ... - + Set Importance to ... Definir importância como... - + Transform ... Transformar ... - - - - + + + + Convert to {0} Converter em {0} - + Merge Child Items into Self Combinar subitens neste documento - + Merge Child Items into New Combinar subitens em um novo documento - + Merge Documents in Folder Combinar documentos no diretório - + Split Document by Headings Dividir documento por cabeçalhos - + Expand All Expandir tudo - + Collapse All Recolher tudo - + Duplicate Duplicar - - + + Delete Permanently Excluir permanentemente - - + + Move to Trash Mover para a lixeira - + Move {0} items to Trash? Mover '{0}' itens para a lixeira? - + Do you want to convert the folder to a {0}? This action cannot be reversed. Deseja converter o diretório em {0}? Esta ação não pode ser desfeita. @@ -4755,7 +4939,7 @@ _UpdatableMenu - + From Template Do modelo @@ -4763,12 +4947,12 @@ _ViewPanelBackRefs - + Document Documento - + First Heading Primeiro cabeçalho @@ -4776,27 +4960,27 @@ _ViewPanelKeyWords - + Tag Etiqueta - + Importance Importância - + Document Documento - + Heading Cabeçalho - + Short Description Breve descrição diff --git a/i18n/nw_zh_CN.ts b/i18n/nw_zh_CN.ts index 46f49630..966a62b4 100644 --- a/i18n/nw_zh_CN.ts +++ b/i18n/nw_zh_CN.ts @@ -4,232 +4,242 @@ Builds - + Document Filters 文档过滤器 - + Novel Documents 小说文档 - + Project Notes 项目笔记 - + Inactive Documents 非活动文档 - + Headings 标题 - + Partition Format 分区格式 - + Chapter Format 章格式 - + Unnumbered Format 未编号格式 - + Scene Format 场景格式 - + Alt. Scene Format 备选场景格式 - + Section Format 小结格式 - + Text Content 文本内容 - + Include Synopsis 包含概要 - + Include Comments 包含注释 - + Include Keywords 包含关键字 - + Include Body Text 包含正文 - + Ignore These Keywords 忽略这些关键字 - + Insert Content 插入内容 - + Add Titles for Notes 为笔记添加标题 - + Text Format 文本格式 - - - Font Family - 字体 - - - - Font Size - 字体大小 - + Text Font + + + + Line Height 行高 - + Text Options 文本选项 - + Justify Text Margins 两端对齐 - + Replace Unicode Characters 替换 Unicode 字符 - + Replace Tabs with Spaces 用空格替换制表符 - - - Page Layout - 页面布局 - - Unit - 单位设置 - - - - Page Size - 页面大小 - - - - Page Width - 页面宽度 - - - - Page Height - 页面高度 - - - - Top Margin - 上边距 - - - - Bottom Margin - 下边距 - - - - Left Margin - 左边距 - - - - Right Margin - 右边距 - - - - Open Document (.odt) - 打开文档 (.odt) - - - - Add Highlight Colours - 添加高亮颜色 - - - - Page Header - 页眉 - - - - Page Counter Offset - 页面计数器偏移 - - - - First Line Indent - 第一行缩进 - - - - Markdown (.md) - Markdown (*.md) - - - Preserve Hard Line Breaks 保留硬行断开 + + + Apply Dialogue Highlighting + + + + + First Line Indent + 第一行缩进 + + + + Enable Indent + + + + + Indent Width + + + + + Indent First Paragraph + + + + + Page Layout + 页面布局 + + + + Unit + 单位设置 + + + + Page Size + 页面大小 + + + + Page Width + 页面宽度 + + + + Page Height + 页面高度 + + + + Top Margin + 上边距 + + + + Bottom Margin + 下边距 + + + + Left Margin + 左边距 + + + + Right Margin + 右边距 + + Open Document (.odt) + 打开文档 (.odt) + + + + Add Highlight Colours + 添加高亮颜色 + + + + Page Header + 页眉 + + + + Page Counter Offset + 页面计数器偏移 + + + HTML (.html) HTML (.html) - + Add CSS Styles 添加CSS样式 - + Preserve Tab Characters 保留制表符 @@ -237,72 +247,72 @@ Common - + in the future 在未来 - + just now 刚才 - + a minute ago 一分钟之前 - + {0} minutes ago {0} 分钟之前 - + an hour ago 一小时之前 - + {0} hours ago {0} 小时之前 - + a day ago 一天之前 - + {0} days ago {0} 天之前 - + a week ago 一周之前 - + {0} weeks ago {0} 周之前 - + a month ago 一个月之前 - + {0} months ago {0} 个月之前 - + a year ago 一年之前 - + {0} years ago {0} 年之前 @@ -310,375 +320,475 @@ Constant - - - + + + None 无 - + Novel 小说 - - + + Plot 情节 - - + + Characters 角色 - - + + Locations 位置 - - + + Timeline 时间线 - - + + Objects 物品 - - + + Entities 条目 - - - + + + Custom 自定义 - + Archive 归档 - + Templates 模板 - + 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 概要 - + Open Document (.odt) 打开文档 (.odt) - + Flat Open Document (.fodt) Flat Open Document (.fodt) - + novelWriter HTML (.html) novelWriter HTML (.htm) - + novelWriter Markup (.txt) novelWriter Markdown (.nwd) - + Standard Markdown (.md) Standard Markdown (.md) - + Extended Markdown (.md) Standard Markdown (.md) - + JSON + novelWriter HTML (.json) JSON + NovelWriter HTML (.json) - + JSON + novelWriter Markup (.json) JSON + NovelWriter Markdown (.json) + + + Square + + + + + Triangle + + + + + Nabla + + + + + Diamond + + + + + Pentagon + + + + + Hexagon + + + Star + + + + + Pacman + + + + + 1/4 Circle + + + + + Half Circle + + + + + 3/4 Circle + + + + + Full Circle + + + + + 1 Bar + + + + + 2 Bars + + + + + 3 Bars + + + + + 4 Bars + + + + + 1 Block + + + + + 2 Blocks + + + + + 3 Blocks + + + + + 4 Blocks + + + + Text files 文本文件 - + Markdown files Markdown 文件 - + novelWriter files novelWriter 文件 - + CSV files CSV 文件 - + All files 所有文件 - + Millimetres 毫米 - + Centimetres 厘米 - + Inches 英寸 - + A4 A4 - + A5 A5 - + A6 A6 - + US Legal 美国法律格式 - + US Letter 美国信件 - + 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 白色右角括号 @@ -704,38 +814,38 @@ GuiBuildSettings - - + + Manuscript Build Settings 手稿构建设置 - + Name 名称 - + Selection 选择 - + Headings 标题 - + Content 内容 - + Format 格式 - + Output 输出 @@ -783,7 +893,7 @@ 无法处理字典文件 - + Added: {0} [{1}B] 已加入: {0} [{1}B] @@ -791,22 +901,22 @@ GuiDocEditFooter - + Line: {0} ({1}) 行数: {0} ({1}) - + Words: {0} ({1}) 单词树: {0} ({1}) - + Words: {0} selected 单词：{0} 已选 - + Status 状态 @@ -814,27 +924,27 @@ GuiDocEditHeader - + Toggle Tool Bar 切换工具栏 - + Outline 提纲 - + Search 搜索 - + Toggle Focus Mode 切换聚焦模式 - + Close 关闭 @@ -842,62 +952,62 @@ GuiDocEditSearch - + Search for 搜索 - + Replace with 替换为 - + Search 搜索 - + 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 在当前文档中查找和替换 @@ -905,122 +1015,122 @@ GuiDocEditor - + Opened Document: {0} 已打开的文档: {0} - + This document has been changed outside of novelWriter while it was open. Overwrite the file on disk? 当前文件已在 novelWriter 之外被修改，是否覆盖掉磁盘上的版本？ - + Could not save document. 无法保存文档。 - + Saved Document: {0} 已保存文档: {0} - + Spell checking requires the package PyEnchant. It does not appear to be installed. 拼写检查需要软件包 PyEnchant。它似乎未安装。 - + Spell check complete 完成拼写检查 - + Document Details 文档详情 - + Created: {0} 已创建{0} - + Updated: {0} 已更新: {0} - + File Location: {0} 文件位置 - + Set as Document Name 设置为文档名称 - + Follow Tag 跟随标签 - + Create Note for 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. 在替换引号之前请选择文本。 - + Do you want to create a new project note for the tag '{0}'? 您想要为标记为'{0}'创建一个新的项目说明吗？ @@ -1104,52 +1214,52 @@ GuiDocToolBar - + Markdown Bold Markdown加粗 - + Markdown Italic Markdown斜体 - + Markdown Strikethrough Markdown 删除线 - + Shortcode Bold Shortcode 加粗 - + Shortcode Italic Shortcode斜体 - + Shortcode Strikethrough Shortcode删除线 - + Shortcode Underline Shortcode下划线 - + Shortcode Highlight 短代码高亮 - + Shortcode Superscript Shortcode上标 - + Shortcode Subscript Shortcode下标 @@ -1157,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel 显示/隐藏查看器面板 - + Comments 注释 - + Show Comments 显示评论 - + Synopsis 概要 - + Show Synopsis Comments 显示概要注释 @@ -1185,27 +1295,27 @@ GuiDocViewHeader - + Outline 提纲 - + Go Backward 向后 - + Go Forward 向前 - + Reload 重新载入 - + Close 关闭 @@ -1213,27 +1323,27 @@ GuiDocViewer - + An error occurred while generating the preview. 在生成预览时发生错误。 - + Copy 复制 - + Select All 全选 - + Select Word 选定单词 - + Select Paragraph 选定段落 @@ -1254,12 +1364,12 @@ GuiEditLabel - + Item Label 条目标签 - + Label 标签 @@ -1267,37 +1377,37 @@ GuiItemDetails - + Label 标签 - + Status 状态 - + Class 分类 - + Usage 用法 - + Characters 字数 - + Words 单词 - + Paragraphs 段落 @@ -1305,27 +1415,27 @@ GuiLipsum - + Insert Placeholder Text 插入占位符文本 - + Insert Lorem Ipsum Text 插入示例文本 - + Number of paragraphs 段落数 - + Randomise order 随机排列 - + Insert 插入 @@ -1333,78 +1443,78 @@ GuiMain - + novelWriter is ready ... novelWriter 已准备就绪… - + You are now running novelWriter version {0}. 您正在运行 novelWriter 版本 {0}。 - + Please check the {0}release notes{1} for further details. 请检查 {0}版本备注{1} 了解更多详情。 - + Close the current project? 关闭当前文档？ - - + + Changes are saved automatically. 已自动保存。 - + Backup the current project? 备份当前项目？ - + The project is already open by another instance of novelWriter, and is therefore locked. Override lock and continue anyway? 该项目已被另一个novelWriter的实例打开，因而现在被锁定。是否覆盖锁定并继续？ - + 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. 注意：如果程序或计算机在此前崩溃，你可以安全地覆盖锁定。 然而，如果项目是在另一个 novelWriter 中打开的，则不建议覆盖它。这样做可能会损坏该项目。 - + The project was locked by the computer '{0}' ({1} {2}), last active on {3}. 该项目被计算机“{0}”（{1}{2}）锁定，上次激活于{3}。 - + The project index is outdated or broken. Rebuilding index. 项目索引已过期或损坏，正在重建索引。 - + Import File 导入文件 - + Could not read file. The file must be an existing text file. 无法读取文件，文件须为已存在的文本文件。 - + Please open a document to import the text file into. 请打开一个文档以将文本文件导入其中。 - + Importing the file will overwrite the current content of the document. Do you want to proceed? 导入文件将覆盖文档的当前内容。 您要继续吗？ - + Indexing completed in {0} ms 在 {0} 秒内完成索引 @@ -1414,22 +1524,22 @@ 项目索引 重建成功。 - + Could not initialise the dialog. 无法初始化对话框。 - + Do you want to exit novelWriter? 您是否想退出novelWriter？ - + Some changes will not be applied until novelWriter has been restarted. 某些改动在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}. 无法找到标签 {0} 的引用. 因为不存在或者索引已经过期。索引可在工具菜单或按 {1} 进行更新。 @@ -1573,13 +1683,13 @@ - Go to Project Tree - 转跳转到项目树 + Go to Tree View + - Go to Document Editor - 转到文档编辑器 + Go to Document + @@ -1797,297 +1907,302 @@ 占位符文本 - + + Footnote + + + + &Format 格式(&F) - + Bold 粗体 - + Italic 斜体 - + Strikethrough 删除线 - + Wrap Double Quotes 用双引号环绕 - + Wrap Single Quotes 环绕单引号 - + More Formats ... 更多格式... - + Bold (Shortcode) 粗体(代码) - + Italics (Shortcode) 斜体(代码) - + Strikethrough (Shortcode) 删除线(代码) - + Underline 下划线 - + Highlight 高亮 - + Superscript 上标 - + Subscript 下标 - + Heading 1 (Partition) 标题 1 (分区) - + Heading 2 (Chapter) 标题2(章节) - + Heading 3 (Scene) 标题 3 (场景) - + Heading 4 (Section) 标题 4 (小节) - + Novel Title 小说标题 - + Unnumbered Chapter 未编号章节 - + Alternative Scene 备选场景 - + Align Left 左对齐 - + Align Centre 居中 - + Align Right 右对齐 - + Indent Left 左缩进 - + Indent Right 右缩进 - + Toggle Comment 切换注释 - + Toggle Ignore Text 切换忽略文本 - + Remove Block Format 移除块格式 - + Replace Straight Single Quotes 替换单引号 - + Replace Straight Double Quotes 替换双引号 - + Remove In-Paragraph Breaks 删除段落间断行 - + &Search 搜索(&S) - + Find 查找 - + Replace 替换 - + Find Next 查找下一个 - + Find Previous 查找上一个 - + Replace Next 替换下一个 - + Find in Project 在项目中查找 - + &Tools 工具(&T) - + Check Spelling 拼写检查 - + Spell Check Language 拼写检查语言 - + Default 默认 - + Re-Run Spell Check 重新执行拼写检查 - + Project Word List 项目单词列表 - + Add Dictionaries 添加字典… - + Rebuild Index 重建索引 - + Backup Project 备份项目 - + Build Manuscript 构建手稿 - + Writing Statistics 写作统计 - + Preferences 设置 - + &Help 帮助(&H) - + About novelWriter 关于 novelWriter - + About Qt5 关于 Qt5 - + User Manual (Online) 用户手册 (在线) - + User Manual (PDF) 用户手册 (PDF) - + Report an Issue (GitHub) 报告issue（GitHub） - + Ask a Question (GitHub) 咨询（Github） - + The novelWriter Website novelWriter 网站 @@ -2096,22 +2211,22 @@ GuiMainStatus - + None 无 - + Editor 编辑器 - + Project 项目 - + Session Time 会话时间 @@ -2134,63 +2249,63 @@ GuiManuscript - + Build Manuscript 构建手稿 - + Add New Build 添加新构建 - + Delete Selected Build 删除选中的构建 - + Edit Selected Build 编辑选定的构建 - + Builds 构建 - + Details 详细信息 - + Outline 提纲 - + Preview 预览 - + Print 打印 - + Build 构建 - + Close 关闭 - - + + My Manuscript 我的手稿： @@ -2256,18 +2371,18 @@ GuiNovelDetails - - + + Novel Details 小说细节 - + Overview 概述 - + Contents 内容 @@ -2275,58 +2390,58 @@ GuiNovelToolBar - + Outline of {0} {0} 的提纲 - + Novel Root 小说根 - + Refresh 刷新 - + Last Column 最后一列 - + Hidden 隐藏 - + Point of View Character 视角人物 - + Focus Character 聚焦章节 - + Novel Plot 小说情节 - - + + Column Size 列大小 - + More Options 更多选项 - + Maximum column size in % 最大列大小为% @@ -2334,7 +2449,7 @@ GuiNovelTree - + No meta data 没有元数据 @@ -2342,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title 标题 - + Chapter 章节 - + Scene 场景 - + Section 小结 - + Document 文档 - + Status 状态 - + Characters 人物 - + Words 单词 - + Paragraphs 段落 - + Synopsis 概要 - + Title Details 标题详情 - + Reference Tags 引用标签 @@ -2407,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns 选定列 @@ -2415,17 +2530,17 @@ GuiOutlineToolBar - + Outline of 提纲 - + Refresh 刷新 - + Export CSV 导出为CSV文件 @@ -2433,7 +2548,7 @@ GuiOutlineTree - + Save Outline As 大纲另存为 @@ -2441,553 +2556,589 @@ GuiPreferences - - + + Preferences 设置 - + Search 搜索 - + General 通用 - + Appearance 外观配置 - + Display language 显示语言 - - - + + Requires restart to take effect. 需要重新启动才能生效。 - + Colour theme 颜色主题 - + General colour theme and icons. 通用颜色主题和图标。 - - Application font family - 应用程序字体类 + + Application font + - - Application font size - 应用程序字体大小 - - - - - pt - pt - - - + Hide vertical scroll bars in main windows 在主窗口中隐藏垂直滚动条 - - + + Scrolling available with mouse wheel and keys only. 仅可使用鼠标滚轮和按键进行滚动。 - + Hide horizontal scroll bars in main windows 在主窗口中隐藏水平滚动条 + + + Use the system's font selection dialog + + + Turn off to use the Qt font dialog, which may have more options. + + + + Document Style 文档样式 - + Document colour theme 文档颜色主题 - + Colour theme for the editor and viewer. 应用于编辑器和查看器的颜色主题。 - - Document font family - 文档字体类 + + Document font + - - - - + + + Applies to both document editor and viewer. 同时应用于文档编辑器和查看器。 - - Document font size - 文档字体大小 - - - + Emphasise partition and chapter labels 强调分区和章节标签 - + Makes them stand out in the project tree. 在项目树中突出它们 - + Show full path in document header 在文档标题中显示完整路径 - + Add the parent folder names to the header. 将父文件夹名称添加到标题中。 - + Include project notes in status bar word count 在状态栏单词计数中包含项目note - + Auto Save 自动保存 - + Save document interval 保存文档间隔 - + How often the document is automatically saved. 自动保存打开的文档的频率。 - - + + seconds 秒 - + Save project interval 保存项目间隔 - + How often the project is automatically saved. 自动保存打开的项目的频率。 - + Project Backup 项目备份 - + Browse 浏览 - + Backup storage location 备份存储位置 - - + + Path: {0} 路径: {0} - + Run backup when the project is closed 项目关闭时进行备份 - + Can be overridden for individual projects in Project Settings. 可以在项目设置中为单个项目重载。 - + Ask before running backup 进行备份前询问 - + If off, backups will run in the background. 如果关闭，备份将在后台运行。 - + Session Timer 会话计时器 - + Pause the session timer when not writing 不写入时暂停会话计时器 - + Also pauses when the application window does not have focus. 当应用程序窗口没有焦点时也会暂停。 - + Editor inactive time before pausing timer 暂停计时器前的编辑器非活动时间 - + User activity includes typing and changing the content. 用户活动包括键入和更改内容。 - + minutes 分钟 - + Writing 写作 - + Text Flow 文本流 - + Maximum text width in "Normal Mode" “正常模式”下的最大文本长度 - + Set to 0 to disable this feature. 设置为 0 以禁用此功能。 - - - - + + + + px 像素 - + Maximum text width in "Focus Mode" “聚焦模式”下的最大文本长度 - + The maximum width cannot be disabled. 不能禁用最大宽度。 - + Hide document footer in "Focus Mode" 在“聚焦模式”中隐藏文档页脚" - + Hide the information bar in the document editor. 在文档编辑器中隐藏信息栏。 - + Justify the text margins 对齐文本边距 - + Minimum text margin 最小文本边距 - + Tab width 制表符宽度 - + The width of a tab key press in the editor and viewer. 编辑器和查看器中 制表符的宽度。 - + Text Editing 文本编辑 - + Spell check language 拼写检查语言 - + Available languages are determined by your system. 可用的语言由您的系统决定。 - + Auto-select word under cursor 自动选择光标下的单词 - + Apply formatting to word under cursor if no selection is made. 如果未进行选择，则将格式应用于光标下的单词。 - + Show tabs and spaces 显示制表符和空格 - + Show line endings 显示行尾 - + Editor Scrolling 编辑器滚动 - + Scroll past end of the document 滚动到文档末尾 - + Also centres the cursor when scrolling. 滚动时光标居中 - + Typewriter style scrolling when you type 打字时打字机样式滚动 - + Keeps the cursor at a fixed vertical position. 将光标保持在一个固定的垂直位置。 - + Minimum position for Typewriter scrolling 打字机滚动的最小位置 - + Percentage of the editor height from the top. 从顶部到编辑器高度的百分比。 - + Text Highlighting 文本高亮 - - Highlight text wrapped in quotes - 高亮包含在引用中的文本 + + None + 无 - - - - Applies to the document editor only. - 仅应用于文档编辑器。 + + Single Quotes + + + + + Double Quotes + + + + + Both + + + + + Highlight dialogue + + + + + Applies to the selected quote styles. + + + + + Allow open-ended dialogue + - Allow open-ended single quotes - 允许开放式单引号 + Highlight dialogue line with no closing quote. + - - Highlight single-quoted line with no closing quote. - 突出显示没有结束引号的单引号行。 + + Dialogue narrator break symbol + - - Allow open-ended double quotes - 允许开放式双引号 + + Symbol to indicate injected narrator break. + - - Highlight double-quoted line with no closing quote. - 突出显示没有结束引号的双引号行。 + + Dialogue line symbol + - + + Lines starting with this symbol are dialogue. + + + + + Alternative dialogue symbols + + + + + Custom highlighting of dialogue text. + + + + Add highlight colour to emphasised text 为强调的文本添加高亮颜色 - + + + Applies to the document editor only. + 仅应用于文档编辑器。 + + + Highlight multiple or trailing spaces 突显重复和结尾的空格 - + Text Automation 文本自动化 - + Auto-replace text as you type 键入时自动替换文本 - + Allow the editor to replace symbols as you type. 允许编辑器在您键入时替换符号。 - + Auto-replace single quotes 自动替换单引号 - - + + Try to guess which is an opening or a closing quote. 尝试猜测哪个是开头或结尾的引号。 - + Auto-replace double quotes 自动替换双引号 - + Auto-replace dashes 自动替换破折号 - + Double and triple hyphens become short and long dashes. 双连字符和三连字符变成短划线和长破折号。 - + Auto-replace dots 自动替换点 - + Three consecutive dots become ellipsis. 三个连续的点变成省略号。 - + Insert non-breaking space before 在之前插入不间断的空格 - + Automatically add space before any of these symbols. 在任何这些符号之前自动添加空格。 - + Insert non-breaking space after 在后面插入不间断的空格 - + Automatically add space after any of these symbols. 在任何这些符号后自动添加空格。 - + Use thin space instead 改用细空格 - + Inserts a thin space instead of a regular space. 插入细空格而不是常规空格。 - + Quotation Style 引述样式 - + Single quote open style 单引号打开样式 - + The symbol to use for a leading single quote. 用于前导单引号的符号。 - + Single quote close style 单引号闭合样式 - + The symbol to use for a trailing single quote. 用于尾随单引号的符号。 - + Double quote open style 双引号打开样式 - + The symbol to use for a leading double quote. 用于前导双引号的符号。 - + Double quote close style 双引号闭合样式 - + The symbol to use for a trailing double quote. 用于尾随双引号的符号。 - + Backup Directory 备份目录 @@ -3023,28 +3174,28 @@ GuiProjectSettings - - + + Project Settings 项目设置 - + Settings 设置 - + Status 状态 - + Importance 重要性 - + Auto-Replace 自动替换 @@ -3052,47 +3203,47 @@ GuiProjectToolBar - + Project Content 项目内容 - + Quick Links 快捷链接 - + Move Up 上移 - + Move Down 下移 - + Add Item 添加条目 - + Expand All 全部展开 - + Collapse All 全部折叠 - + Empty Trash 清空回收站 - + More Options 更多选项 @@ -3100,122 +3251,130 @@ GuiProjectTree - + Active 活跃 - + Inactive 非活跃 - + Permanently delete {0} file(s) from Trash? 从回收站中永久删除 {0} 文件？ - + Did not find anywhere to add the file or folder! 没有找到任何地方添加文件或文件夹！ - + Cannot add new files or folders to the Trash folder. 无法将新文件或文件夹添加到废纸篓文件夹。 - + New Note 新笔记 - + New Chapter 新章节 - + New Scene 新场景 - + New Document 新文档 - + New Folder 新文件夹 - + There is currently no Trash folder in this project. 此项目中当前没有回收站文件夹。 - + The Trash folder is already empty. 回收站文件夹已清空。 - + Move '{0}' to Trash? 将“{0}”移至回收站吗？ - + Root folders can only be deleted when they are empty. 只有当根文件夹为空时才能删除。 - + Permanently delete '{0}'? 彻底删除“{0}”吗？ - + Drag and drop is only allowed for single items, non-root items, or multiple items with the same parent. 只允许对单个项目、非根项目或具有相同父项的多个项目进行拖放操作。 - + No documents selected for merging. 未选择要合并的文档。 - + Merged 已合并 - - + + Could not write document content. 无法写入文档内容。 - + Do you want to duplicate this document? 您想要复制此文档吗？ - + Do you want to duplicate this item and all child items? 您想要复制此项目和所有子项目吗？ - + Could not duplicate all items. 无法复制所有项目。 - + There is nowhere to add item with name '{0}'. 无处可添加名为 '{0}' 的项目。 + + GuiQuoteSelect + + + Select Quote Style + + + GuiSideBar @@ -3300,33 +3459,33 @@ GuiWordList - - + + Project Word List 项目单词列表 - + Import words from text file 从文本文件导入单词 - + Export words to text file 导出单词到文本文件 - + Note: The import file must be a plain text file with UTF-8 or ASCII encoding. 注意：导入文件必须是采用 UTF-8 或 ASCII 编码的纯文本文件。 - + Import File 导入文件 - + Export File 导出文件 @@ -3334,147 +3493,147 @@ GuiWritingStats - + Writing Statistics 写作统计 - + Session Start 会话开始 - + Length 长度 - + Idle 空闲 - + Words 单词 - + Histogram 直方图 - + Sum Totals 总和 - + Total Time: 总时间： - + Idle Time: 空余时间： - + Filtered Time: 过滤时间： - + Novel Word Count: 小说字数： - + Notes Word Count: 笔记字数： - + Total Word Count: 总字数： - + Filters 过滤器 - + Count novel files 计算小说文件 - + Count note files 计算笔记文件 - + Hide zero word count 隐藏零字数 - + Hide negative word count 隐藏负字数 - + Group entries by day 按天分组 - + Show idle time 显示空闲时间 - + Word count cap for the histogram 直方图的字数上限 - + Save As 另存为 - + JSON Data File (.json) JSON Data File (.json) - + CSV Data File (.csv) CSV Data File (.csv) - + JSON Data File JSON Data File - + CSV Data File CSV Data File - + Save Data As 另存为 - + {0} file successfully written to: {0} 文件已被成功写入： - + Failed to write {0} file. 写入文件 {0} 失败. @@ -3482,153 +3641,153 @@ NWProject - + Could not delete document file. 无法删除文档文件。 - + Not a known project file format. 不是已知的项目文件格式。 - + Project file not found. 未找到项目文件。 - + Failed to open project. 无法打开项目。 - + Unknown 未知 - + Project file does not appear to be a novelWriterXML file. 项目文件似乎不是 NovelWriterXML 文件。 - + 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}. 未知或不受支持的 NovelWriter 项目文件格式。 此版本的NovelWriter 无法打开该项目。 该文件是用 NovelWriter 版本 {0} 保存的。 - + Failed to parse project xml. 无法解析项目 xml。 - + 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? 您的项目的文件格式即将更新。 如果您继续，较旧版本的新作家将无法再打开此项目，是否继续？ - + 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? 此项目由较新版本的 novelWriter 版本 {0} 保存。 这是版本 {1}。 如果继续打开项目，可能有些属性和设置不会保留，但整体项目应该没问题。 继续打开项目？ - + Recovered 已复原 - + Found {0} orphaned file(s) in the project. {1} file(s) were recovered. 在项目中找到了 {0} 个无主文件(s) 。 {1} 文件已被恢复。 - + Opened Project: {0} 已打开的项目：{0} - + There is no project open. 没有打开的项目。 - + Failed to save project. 保存项目失败。 - + Saved Project: {0} 已保存项目： {0} - + Backing up project ... 项目备份中…… - + Cannot backup project because no project name is set. Please set a Project Name in Project Settings. 由于未设置项目名，无法备份项目。 请在项目设置中指定项目名。 - + Could not create backup folder. 无法创建备份文件夹。 - + Created a backup of your project of size {0}B. 创建了大小为 {0}B 的项目备份。 - + Path: {0} 路径: {0} - + Could not write backup archive. 无法写入备份存档。 - + Project backed up to '{0}' 项目备份到{0} - - + + New 新建 - + Note 笔记 - + Draft 草稿 - + Finished 已完成 - + Minor 次要 - + Major 主要 - + Main 主要的 @@ -3644,89 +3803,89 @@ ProjectBuilder - + The target folder is not empty. Please choose another folder. 目标文件夹不为空。 请选择其他文件夹。 - + An error occurred while trying to create the project. 尝试创建项目时发生错误。 - + New Project 创建项目 - + Title Page 标题页面 - + By 由 - + Summary of the chapter. 本章概要。 - + Summary of the scene. 场景概况。 - + A short description. 简短描述 - + Chapter {0} 章节 {0} - - + + Scene {0} 场景 {0} - + Main Plot 主线情节 - + Protagonist 主角 - + Main Location 主位置 - - + + The target folder already exists. Please choose another folder. 目标文件夹已存在。 请选择其他文件夹。 - + Could not copy project files. 无法复制项目文件。 - + Failed to create a new example project. 无法创建新的示例项目。 - + Failed to create a new example project. Could not find the necessary files. They seem to be missing from this installation. 无法创建新的示例项目。 找不到必要的文件。此安装中似乎缺少它们。 @@ -3863,20 +4022,25 @@ SharedData - + novelWriter Project File or Zip File novelWriter 项目文件或 Zip 文件 - + novelWriter Project File novelWriter 项目文件 - + Open Project 打开项目 + + + Select Font + + VersionInfoWidget @@ -3924,57 +4088,57 @@ _ContentsPage - + Table of Contents 目录 - + Title 标题 - + Words 单词 - + Pages 页面 - + Page 页面 - + Progress 进度 - + Words per page 每页字数 - + First page offset 第一页偏移 - + Chapters on odd pages 章节位于奇数页 - + Untitled 未命名 - + END 结束 @@ -3982,32 +4146,32 @@ _DetailsWidget - + Setting 设置 - + Value 值 - + Name 名称 - + Selection 选择 - + Title 标题 - + Hidden 隐藏 @@ -4015,37 +4179,37 @@ _FilterTab - + Included in manuscript 包含在手稿中 - + Excluded from manuscript 从手稿中排除 - + Always included 始终包含 - + Always excluded 始终排除 - + Reset to default 重置为默认值 - + Mark selection as 标记选区为 - + Select Root Folders 选择根文件夹 @@ -4053,22 +4217,22 @@ _GuiAlert - + Information 信息 - + Warning 警告 - + Error 错误 - + Question 问题 @@ -4076,93 +4240,93 @@ _HeadingsTab - + Hide 隐藏 - - + + Editing: {0} 正在编辑 {0} - - + + None 无 - + Title 标题 - + Chapter Number 章节编号 - + Chapter Number (Word) 章节编号(Word) - + Chapter Number (Upper Case Roman) 章节编号（大写罗马数字） - + Chapter Number (Lower Case Roman) 章节编号（小写罗马数字） - + Scene Number (In Chapter) 场景编号 (章节) - + Scene Number (Absolute) 场景编号(绝对) - + Point of View Character 视角人物 - + Focus Character 聚焦章节 - + Insert 插入 - + Apply 应用 - + Additional Styling 附加样式 - - - + + + Centre 居中 - - - + + + Page Break 分页符 @@ -4170,117 +4334,117 @@ _NewProjectForm - + Required 必填项 - + Optional 可选 - + Create a fresh project 创建一个新项目 - + Create an example project 创建一个示例项目 - + Copy an existing project 复制一个现有项目 - + Project Name 项目名称 - + Author 作者 - + Project Path 项目路径 - + Prefill Project 预填项目 - + Set to 0 to only add scenes 设置为 0 仅添加场景 - + Add {0} chapter documents 添加 {0} 章节文档 - + Add {0} scene documents (to each chapter) 将{0} 场景文档添加（到每个章节） - + Add a folder for plot notes 为情节笔记添加一个文件夹 - + Add a folder for character notes 为章节笔记添加文件夹 - + Add a folder for location notes 为位置笔记添加文件夹 - + Add example notes to the above 在上面添加示例注释 - + Chapters and Scenes 章节和场景 - + Project Notes 项目笔记 - + Create New Project 新建项目 - + Select Project Folder 选择项目文件夹 - + Fresh Project 新项目 - + Example Project 示例项目 - + Template: {0} 模板︰ {0} @@ -4288,7 +4452,7 @@ _NewProjectPage - + A project name is required. 项目名称是必需的。 @@ -4296,27 +4460,27 @@ _OpenProjectPage - + The project path is not reachable. 无法访问项目路径。 - + Path 路径 - + Remove '{0}' from the recent projects list? The project files will not be deleted. 从最近的项目列表中删除 '{0}'？项目文件将不会被删除。 - + Open Project 打开项目 - + Remove Project 移除项目 @@ -4324,54 +4488,54 @@ _OverviewPage - + Project 项目 - - + + Name 名称 - + Revisions 修订 - + Editing Time 编辑时间 - - + + Word Count 字数 - + In Novels 在 Novels 中 - + In Notes 在笔记中 - + Selected Novel 选定的小说 - + Chapters 章节 - + Scenes 场景 @@ -4379,40 +4543,40 @@ _PreviewWidget - + Press the "Preview" button to generate ... 按“预览”按钮生成... - + Processing ... 处理中... - + Done 完成 - - Unknown - 未知 - - - + Built 创建： + + + No Preview + + _ProjectListModel - + Word Count 字数 - + Last Opened 最近打开 @@ -4420,77 +4584,77 @@ _ReplacePage - + Text Auto-Replace for Preview and Build 用于预览和构建的文本自动替换 - + Keyword 关键字 - + Replace With 替换为 - + Select item to edit 选择要修改的条目 - - Save - 保存 + + Apply + 应用 _SettingsPage - + Project name 项目名称 - + Changing this will affect the backup path. 更改此设置将影响备份路径。 - + Author(s) 作者 - - + + Only used when building the manuscript. 仅在构建手稿时使用。 - + Project language 项目语言 - + Default 默认 - + Spell check language 拼写检查语言 - - + + Overrides main preferences. 覆盖主要首选项。 - + Disable backup on close 关闭时禁用备份 @@ -4498,59 +4662,59 @@ _StatsWidget - - + + Words 单词 - - + + Characters 字符数 - + Words in Headings 标题中的单词 - + Words in Text 文本中的单词 - + Headings 标题 - + Paragraphs 段落 - + Characters in Headings 标题中的字符 - + Characters in Text 文本中的字符 - + Characters, No Spaces 字符，无空格 - + Characters in Headings, No Spaces 标题中的字符，无空格 - + Characters in Text, No Spaces 文本中的字符，无空格 @@ -4558,196 +4722,216 @@ _StatusPage - + Novel Document Status Levels 新建文档状态级别 - + Project Note Importance Levels 项目注释重要性级别 - - Label - 标签 - - - - Usage - 用法 - - - - Select item to edit - 选择要修改的条目 - - - - Colour - 颜色 - - - - Save - 保存 - - - - Select Colour - 选择颜色 - - - - New Item - 新项目 - - - - Cannot delete a status item that is in use. - 无法删除正在使用的状态项。 - - - + Not in use 未使用 - + Used once 使用过一次 - + Used by {0} items 被 {0} 项目使用 + + + Select Colour + 选择颜色 + + + + Label + 标签 + + + + Usage + 用法 + + + + Select item to edit + 选择要修改的条目 + + + + Colour + 颜色 + + + + Circles ... + + + + + Bars ... + + + + + Blocks ... + + + + + Shape + + + + + Apply + 应用 + + + + New Item + 新项目 + + + + Cannot delete a status item that is in use. + 无法删除正在使用的状态项。 + _TreeContextMenu - + Empty Trash 清空回收站 - + Rename 重命名 - + Open Document 打开文档 - + View Document 查看文档 - + Create New ... 创建新的... - + Rename to Heading 重命名为标题 - + Set Active to ... 设置活跃性为... - + Toggle Active 切换活动状态 - + Set Status to ... 设置状态为... - - + + Manage Labels ... 管理标签... - + Set Importance to ... 设置重要性为... - + Transform ... 转换 ... - - - - + + + + Convert to {0} 转换为 {0} - + Merge Child Items into Self 将子项合并到该项 - + Merge Child Items into New 将子项合并为新项 - + Merge Documents in Folder 合并文件夹中的文档 - + Split Document by Headings 按标题拆分文档 - + Expand All 全部展开 - + Collapse All 全部折叠 - + Duplicate 重复 - - + + Delete Permanently 永久删除 - - + + Move to Trash 移动到回收站 - + Move {0} items to Trash? 将“{0}”移至回收站吗？ - + Do you want to convert the folder to a {0}? This action cannot be reversed. 您想要将文件夹转换为 {0} 吗？此操作不能被撤销。 @@ -4755,7 +4939,7 @@ _UpdatableMenu - + From Template 从模板 @@ -4763,12 +4947,12 @@ _ViewPanelBackRefs - + Document 文档 - + First Heading 首页标题 @@ -4776,27 +4960,27 @@ _ViewPanelKeyWords - + Tag 标签 - + Importance 重要级 - + Document 文档 - + Heading 标题 - + Short Description 简短描述 From 880b560a39b7f6d96ef095087f058593a3797716 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Mon, 24 Jun 2024 16:38:25 +0200 Subject: [PATCH 36/67] Bump main branch to 2.6 alpha 0 --- novelwriter/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/novelwriter/__init__.py b/novelwriter/__init__.py index 8a81ae2c..351c3ae0 100644 --- a/novelwriter/__init__.py +++ b/novelwriter/__init__.py @@ -47,9 +47,9 @@ __license__ = "GPLv3" __author__ = "Veronica Berglyd Olsen" __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" -__version__ = "2.5rc1" -__hexversion__ = "0x020500c1" -__date__ = "2024-06-22" +__version__ = "2.6a0" +__hexversion__ = "0x020600a0" +__date__ = "2024-06-24" __status__ = "Stable" __domain__ = "novelwriter.io" From 069e35565fdbb021f5d79641d6f7977200e81306 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 3 Jul 2024 18:18:41 +0200 Subject: [PATCH 37/67] Refresh coloured labels when theme change (#1951) --- novelwriter/extensions/configlayout.py | 21 ++++++++++++++++++--- novelwriter/gui/doceditor.py | 6 +++--- novelwriter/gui/docviewer.py | 4 +++- novelwriter/gui/outline.py | 1 + 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/novelwriter/extensions/configlayout.py b/novelwriter/extensions/configlayout.py index 53354b4b..42a2e29c 100644 --- a/novelwriter/extensions/configlayout.py +++ b/novelwriter/extensions/configlayout.py @@ -281,13 +281,28 @@ class NColourLabel(QLabel): return + def setTextColors(self, *, color: QColor | None = None, faded: QColor | None = None) -> None: + """Set or update the text colours.""" + self._color = color or self._color + self._faded = faded or self._faded + self._refeshTextColor() + return + def setColorState(self, state: bool) -> None: """Change the colour state.""" if self._state is not state: self._state = state - colour = self.palette() - colour.setColor(QPalette.ColorRole.WindowText, self._color if state else self._faded) - self.setPalette(colour) + self._refeshTextColor() + return + + def _refeshTextColor(self) -> None: + """Refresh the colour of the text on the label.""" + palette = self.palette() + palette.setColor( + QPalette.ColorRole.WindowText, + self._color if self._state else self._faded, + ) + self.setPalette(palette) return diff --git a/novelwriter/gui/doceditor.py b/novelwriter/gui/doceditor.py index 39adc29d..7722339b 100644 --- a/novelwriter/gui/doceditor.py +++ b/novelwriter/gui/doceditor.py @@ -2919,10 +2919,10 @@ class GuiDocEditHeader(QWidget): palette.setColor(QPalette.ColorRole.Window, SHARED.theme.colBack) palette.setColor(QPalette.ColorRole.WindowText, SHARED.theme.colText) palette.setColor(QPalette.ColorRole.Text, SHARED.theme.colText) - self.setPalette(palette) - self.itemTitle.setPalette(palette) - + self.itemTitle.setTextColors( + color=palette.windowText().color(), faded=SHARED.theme.fadedText + ) return def changeFocusState(self, state: bool) -> None: diff --git a/novelwriter/gui/docviewer.py b/novelwriter/gui/docviewer.py index b28411ab..f013db0b 100644 --- a/novelwriter/gui/docviewer.py +++ b/novelwriter/gui/docviewer.py @@ -741,7 +741,9 @@ class GuiDocViewHeader(QWidget): palette.setColor(QPalette.ColorRole.WindowText, SHARED.theme.colText) palette.setColor(QPalette.ColorRole.Text, SHARED.theme.colText) self.setPalette(palette) - self.itemTitle.setPalette(palette) + self.itemTitle.setTextColors( + color=palette.windowText().color(), faded=SHARED.theme.fadedText + ) return def changeFocusState(self, state: bool) -> None: diff --git a/novelwriter/gui/outline.py b/novelwriter/gui/outline.py index 3a411f35..054f0fb4 100644 --- a/novelwriter/gui/outline.py +++ b/novelwriter/gui/outline.py @@ -268,6 +268,7 @@ class GuiOutlineToolBar(QToolBar): self.aExport.setIcon(SHARED.theme.getIcon("export")) self.tbColumns.setIcon(SHARED.theme.getIcon("menu")) self.tbColumns.setStyleSheet("QToolButton::menu-indicator {image: none;}") + self.novelLabel.setTextColors(color=self.palette().windowText().color()) return def populateNovelList(self) -> None: From e1bcfcfc0511a775b39aab90fe2bb9f1ed1e6647 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 3 Jul 2024 18:29:38 +0200 Subject: [PATCH 38/67] Convert Preferences dialog to save/cancel like Project Settings --- novelwriter/dialogs/preferences.py | 31 +++++++--------------- tests/test_dialogs/test_dlg_preferences.py | 12 +++------ 2 files changed, 12 insertions(+), 31 deletions(-) diff --git a/novelwriter/dialogs/preferences.py b/novelwriter/dialogs/preferences.py index 2904476e..f433529e 100644 --- a/novelwriter/dialogs/preferences.py +++ b/novelwriter/dialogs/preferences.py @@ -29,8 +29,8 @@ import logging from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot from PyQt5.QtGui import QCloseEvent, QKeyEvent, QKeySequence from PyQt5.QtWidgets import ( - QAbstractButton, QCompleter, QDialogButtonBox, QFileDialog, QHBoxLayout, - QLineEdit, QPushButton, QVBoxLayout, QWidget + QCompleter, QDialogButtonBox, QFileDialog, QHBoxLayout, QLineEdit, + QPushButton, QVBoxLayout, QWidget ) from novelwriter import CONFIG, SHARED @@ -43,10 +43,7 @@ from novelwriter.extensions.modified import ( ) from novelwriter.extensions.pagedsidebar import NPagedSideBar from novelwriter.extensions.switch import NSwitch -from novelwriter.types import ( - QtAlignCenter, QtDialogApply, QtDialogClose, QtDialogSave, QtRoleAccept, - QtRoleApply, QtRoleReject -) +from novelwriter.types import QtAlignCenter, QtDialogCancel, QtDialogSave logger = logging.getLogger(__name__) @@ -89,8 +86,9 @@ class GuiPreferences(NDialog): self.mainForm.setHelpTextStyle(SHARED.theme.helpText) # Buttons - self.buttonBox = QDialogButtonBox(QtDialogApply | QtDialogSave | QtDialogClose, self) - self.buttonBox.clicked.connect(self._dialogButtonClicked) + self.buttonBox = QDialogButtonBox(QtDialogSave | QtDialogCancel, self) + self.buttonBox.accepted.connect(self._doSave) + self.buttonBox.rejected.connect(self.reject) # Assemble self.searchBox = QHBoxLayout() @@ -784,19 +782,6 @@ class GuiPreferences(NDialog): # Private Slots ## - @pyqtSlot("QAbstractButton*") - def _dialogButtonClicked(self, button: QAbstractButton) -> None: - """Handle button clicks from the dialog button box.""" - role = self.buttonBox.buttonRole(button) - if role == QtRoleApply: - self._saveValues() - elif role == QtRoleAccept: - self._saveValues() - self.close() - elif role == QtRoleReject: - self.close() - return - @pyqtSlot(int) def _sidebarClicked(self, section: int) -> None: """Process a user request to switch page.""" @@ -897,7 +882,7 @@ class GuiPreferences(NDialog): CONFIG.setPreferencesWinSize(self.width(), self.height()) return - def _saveValues(self) -> None: + def _doSave(self) -> None: """Save the values set in the form.""" updateTheme = False needsRestart = False @@ -1012,4 +997,6 @@ class GuiPreferences(NDialog): CONFIG.saveConfig() self.newPreferencesReady.emit(needsRestart, refreshTree, updateTheme, updateSyntax) + self.close() + return diff --git a/tests/test_dialogs/test_dlg_preferences.py b/tests/test_dialogs/test_dlg_preferences.py index 7a27490a..0531ab4b 100644 --- a/tests/test_dialogs/test_dlg_preferences.py +++ b/tests/test_dialogs/test_dlg_preferences.py @@ -30,7 +30,7 @@ from novelwriter import CONFIG, SHARED from novelwriter.constants import nwUnicode from novelwriter.dialogs.preferences import GuiPreferences from novelwriter.dialogs.quotes import GuiQuoteSelect -from novelwriter.types import QtDialogApply, QtDialogClose, QtDialogSave, QtModNone +from novelwriter.types import QtDialogCancel, QtDialogSave, QtModNone KEY_DELAY = 1 @@ -116,12 +116,6 @@ def testDlgPreferences_Actions(qtbot, monkeypatch, nwGUI): prefs._gotoSearch() assert value.args[0] < old - # Check Apply Button - prefs.show() - with qtbot.waitSignal(prefs.newPreferencesReady) as signal: - prefs.buttonBox.button(QtDialogApply).click() - assert signal.args == [False, False, False, False] - # Check Save Button prefs.show() with qtbot.waitSignal(prefs.newPreferencesReady) as signal: @@ -130,7 +124,7 @@ def testDlgPreferences_Actions(qtbot, monkeypatch, nwGUI): # Check Close Button prefs.show() - prefs.buttonBox.button(QtDialogClose).click() + prefs.buttonBox.button(QtDialogCancel).click() assert prefs.isHidden() is True # Close Using Escape Key @@ -315,7 +309,7 @@ def testDlgPreferences_Settings(qtbot, monkeypatch, nwGUI, tstPaths): with monkeypatch.context() as mp: mp.setattr(QFontDatabase, "families", lambda *a: ["TestFont"]) with qtbot.waitSignal(prefs.newPreferencesReady) as signal: - prefs.buttonBox.button(QtDialogApply).click() + prefs.buttonBox.button(QtDialogSave).click() assert signal.args == [True, True, True, True] # Check Settings From 42b1e6a55905934564dc10295cafb31093915da2 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 3 Jul 2024 18:38:32 +0200 Subject: [PATCH 39/67] Only switch focus between editor and viewer when viewer is visible (#1950) --- novelwriter/guimain.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/novelwriter/guimain.py b/novelwriter/guimain.py index b7ccfedf..1732e113 100644 --- a/novelwriter/guimain.py +++ b/novelwriter/guimain.py @@ -1023,9 +1023,10 @@ class GuiMain(QMainWindow): self.projView.setTreeFocus() elif paneNo == nwFocus.DOCUMENT: self._changeView(nwView.EDITOR) - if self.docEditor.anyFocus(): + hasViewer = self.splitView.isVisible() + if hasViewer and self.docEditor.anyFocus(): self.docViewer.setFocus() - elif self.docViewer.anyFocus(): + elif hasViewer and self.docViewer.anyFocus(): self.docEditor.setFocus() else: self.docEditor.setFocus() From 5e8892ee7c688758515c40b5bb3ef454a10c8a25 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 3 Jul 2024 19:39:29 +0200 Subject: [PATCH 40/67] Rewrite the tree view focus switch (#1949) --- novelwriter/guimain.py | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/novelwriter/guimain.py b/novelwriter/guimain.py index 1732e113..8e25e25d 100644 --- a/novelwriter/guimain.py +++ b/novelwriter/guimain.py @@ -1006,21 +1006,34 @@ class GuiMain(QMainWindow): def _switchFocus(self, paneNo: nwFocus) -> None: """Switch focus between main GUI views.""" if paneNo == nwFocus.TREE: - if self.projStack.currentWidget() is self.projView: - if self.projView.treeHasFocus(): - self._changeView(nwView.NOVEL) - self.novelView.setTreeFocus() - else: - self.projView.setTreeFocus() - elif self.projStack.currentWidget() is self.novelView: - if self.novelView.treeHasFocus(): - self._changeView(nwView.PROJECT) - self.projView.setTreeFocus() - else: - self.novelView.setTreeFocus() + # Decision Matrix + # vM | vP | fP | vN | fN | Focus + # ----|----|----|----|----|--------- + # T | T | T | F | F | Novel + # T | T | F | F | F | Project + # T | F | F | T | T | Project + # T | F | F | T | F | Novel + # T | F | F | F | F | Project + # F | T | T | F | F | Project + # F | T | F | F | F | Project + # F | F | F | T | T | Novel + # F | F | F | T | F | Novel + # F | F | F | F | F | Project + + vM = self.mainStack.currentWidget() is self.splitMain + vP = self.projStack.currentWidget() is self.projView + vN = self.projStack.currentWidget() is self.novelView + fP = self.projView.treeHasFocus() + fN = self.novelView.treeHasFocus() + + self._changeView(nwView.EDITOR) + if (vM and (vP and fP or vN and not fN)) or (not vM and vN): + self._changeView(nwView.NOVEL) + self.novelView.setTreeFocus() else: self._changeView(nwView.PROJECT) self.projView.setTreeFocus() + elif paneNo == nwFocus.DOCUMENT: self._changeView(nwView.EDITOR) hasViewer = self.splitView.isVisible() @@ -1030,9 +1043,11 @@ class GuiMain(QMainWindow): self.docEditor.setFocus() else: self.docEditor.setFocus() + elif paneNo == nwFocus.OUTLINE: self._changeView(nwView.OUTLINE) self.outlineView.setTreeFocus() + return @pyqtSlot(bool, bool, bool, bool) From f4f3f82954fce3534f8964e26d9d7d107be65cba Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 3 Jul 2024 20:29:00 +0200 Subject: [PATCH 41/67] Add a wait statement to check paintEvent in Preferences --- tests/test_dialogs/test_dlg_preferences.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/test_dialogs/test_dlg_preferences.py b/tests/test_dialogs/test_dlg_preferences.py index 0531ab4b..1d186d83 100644 --- a/tests/test_dialogs/test_dlg_preferences.py +++ b/tests/test_dialogs/test_dlg_preferences.py @@ -92,7 +92,8 @@ def testDlgPreferences_Actions(qtbot, monkeypatch, nwGUI): """Test the preferences dialog actions.""" monkeypatch.setattr(SHARED._spelling, "listDictionaries", lambda: [("en", "English [en]")]) prefs = GuiPreferences(nwGUI) - prefs.show() + with qtbot.waitExposed(prefs): + prefs.show() # Check Navigation vBar = prefs.mainForm.verticalScrollBar() @@ -146,7 +147,8 @@ def testDlgPreferences_Settings(qtbot, monkeypatch, nwGUI, tstPaths): monkeypatch.setattr(CONFIG, "listLanguages", lambda *a: languages) prefs = GuiPreferences(nwGUI) - prefs.show() + with qtbot.waitExposed(prefs): + prefs.show() # Appearance prefs.guiLocale.setCurrentIndex(prefs.guiLocale.findData("en_US")) From 9f88f3b79e0ddb336e2d46d22def76e336c0f808 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 4 Jul 2024 15:16:15 +0200 Subject: [PATCH 42/67] Update translations for 2.5 and add Polish --- i18n/nw_base.ts | 300 +- i18n/nw_de_DE.ts | 440 +- i18n/nw_en_US.ts | 420 +- i18n/nw_fr_FR.ts | 420 +- i18n/nw_it_IT.ts | 420 +- i18n/nw_ja_JP.ts | 420 +- i18n/nw_nb_NO.ts | 420 +- i18n/nw_nl_NL.ts | 420 +- i18n/nw_pl_PL.ts | 4988 ++++++++++++++++++++ i18n/nw_pt_BR.ts | 426 +- i18n/nw_zh_CN.ts | 420 +- novelwriter/assets/i18n/project_pl_PL.json | 116 + 12 files changed, 7157 insertions(+), 2053 deletions(-) create mode 100644 i18n/nw_pl_PL.ts create mode 100644 novelwriter/assets/i18n/project_pl_PL.json diff --git a/i18n/nw_base.ts b/i18n/nw_base.ts index eb56db38..2e2f8162 100644 --- a/i18n/nw_base.ts +++ b/i18n/nw_base.ts @@ -1267,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel - + Comments - + Show Comments - + Synopsis - + Show Synopsis Comments @@ -1534,12 +1534,12 @@ - + Some changes will not be applied until novelWriter has been restarted. - + 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}. @@ -2457,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title - + Chapter - + Scene - + Section - + Document - + Status - + Characters - + Words - + Paragraphs - + Synopsis - + Title Details - + Reference Tags @@ -2522,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns @@ -2548,7 +2548,7 @@ GuiOutlineTree - + Save Outline As @@ -2556,589 +2556,589 @@ GuiPreferences - - + + Preferences - + Search - + General - + Appearance - + Display language - - + + Requires restart to take effect. - + Colour theme - + General colour theme and icons. - + Application font - + Hide vertical scroll bars in main windows - - + + Scrolling available with mouse wheel and keys only. - + Hide horizontal scroll bars in main windows - + Use the system's font selection dialog - + Turn off to use the Qt font dialog, which may have more options. - + Document Style - + Document colour theme - + Colour theme for the editor and viewer. - + Document font - - - + + + Applies to both document editor and viewer. - + Emphasise partition and chapter labels - + Makes them stand out in the project tree. - + Show full path in document header - + Add the parent folder names to the header. - + Include project notes in status bar word count - + Auto Save - + Save document interval - + How often the document is automatically saved. - - + + seconds - + Save project interval - + How often the project is automatically saved. - + Project Backup - + Browse - + Backup storage location - - + + Path: {0} - + Run backup when the project is closed - + Can be overridden for individual projects in Project Settings. - + Ask before running backup - + If off, backups will run in the background. - + Session Timer - + Pause the session timer when not writing - + Also pauses when the application window does not have focus. - + Editor inactive time before pausing timer - + User activity includes typing and changing the content. - + minutes - + Writing - + Text Flow - + Maximum text width in "Normal Mode" - + Set to 0 to disable this feature. - - - - + + + + px - + Maximum text width in "Focus Mode" - + The maximum width cannot be disabled. - + Hide document footer in "Focus Mode" - + Hide the information bar in the document editor. - + Justify the text margins - + Minimum text margin - + Tab width - + The width of a tab key press in the editor and viewer. - + Text Editing - + Spell check language - + Available languages are determined by your system. - + Auto-select word under cursor - + Apply formatting to word under cursor if no selection is made. - + Show tabs and spaces - + Show line endings - + Editor Scrolling - + Scroll past end of the document - + Also centres the cursor when scrolling. - + Typewriter style scrolling when you type - + Keeps the cursor at a fixed vertical position. - + Minimum position for Typewriter scrolling - + Percentage of the editor height from the top. - + Text Highlighting - + None - + Single Quotes - + Double Quotes - + Both - + Highlight dialogue - + Applies to the selected quote styles. - + Allow open-ended dialogue - + Highlight dialogue line with no closing quote. - + Dialogue narrator break symbol - + Symbol to indicate injected narrator break. - + Dialogue line symbol - + Lines starting with this symbol are dialogue. - + Alternative dialogue symbols - + Custom highlighting of dialogue text. - + Add highlight colour to emphasised text - - + + Applies to the document editor only. - + Highlight multiple or trailing spaces - + Text Automation - + Auto-replace text as you type - + Allow the editor to replace symbols as you type. - + Auto-replace single quotes - - + + Try to guess which is an opening or a closing quote. - + Auto-replace double quotes - + Auto-replace dashes - + Double and triple hyphens become short and long dashes. - + Auto-replace dots - + Three consecutive dots become ellipsis. - + Insert non-breaking space before - + Automatically add space before any of these symbols. - + Insert non-breaking space after - + Automatically add space after any of these symbols. - + Use thin space instead - + Inserts a thin space instead of a regular space. - + Quotation Style - + Single quote open style - + The symbol to use for a leading single quote. - + Single quote close style - + The symbol to use for a trailing single quote. - + Double quote open style - + The symbol to use for a leading double quote. - + Double quote close style - + The symbol to use for a trailing double quote. - + Backup Directory diff --git a/i18n/nw_de_DE.ts b/i18n/nw_de_DE.ts index 53382565..999e7849 100644 --- a/i18n/nw_de_DE.ts +++ b/i18n/nw_de_DE.ts @@ -106,7 +106,7 @@ Text Font - + Schriftart @@ -141,7 +141,7 @@ Apply Dialogue Highlighting - + Wörtliche Rede hervorheben @@ -151,17 +151,17 @@ Enable Indent - + Einzug aktivieren Indent Width - + Einzug Breite Indent First Paragraph - + Einzug erster Absatz @@ -335,13 +335,13 @@ Plot - Handlungen + Handlung Characters - Figuren + Charaktere @@ -535,102 +535,102 @@ Square - + Quadrat Triangle - + Dreieck Nabla - + Nabla Diamond - + Raute Pentagon - + Fünfeck Hexagon - + Sechseck Star - + Stern Pacman - + Pacman 1/4 Circle - + 1/4-Kreis Half Circle - + Halbkreis 3/4 Circle - + 3/4-Kreis Full Circle - + Voller Kreis 1 Bar - + 1 Balken 2 Bars - + 2 Balken 3 Bars - + 3 Balken 4 Bars - + 4 Balken 1 Block - + 1 Block 2 Blocks - + 2 Blöcke 3 Blocks - + 3 Blöcke 4 Blocks - + 4 Blöcke @@ -1267,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel Ansichtsbereich ein-/ausblenden - + Comments Kommentare - + Show Comments Kommentare anzeigen - + Synopsis Zusammenfassung - + Show Synopsis Comments Zusammenfassung anzeigen @@ -1534,12 +1534,12 @@ Möchten Sie novelWriter beenden? - + Some changes will not be applied until novelWriter has been restarted. Einige Änderungen können erst nach Neustart von novelWriter angewendet werden. - + 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}. Der Verweis für das Schlagwort „{0}“ konnte nicht gefunden werden. Entweder es existiert nicht oder der Index ist veraltet. Aktualisieren Sie den Index über den Menüpunkt „Extras“ oder mit der Taste {1}. @@ -1684,12 +1684,12 @@ Go to Tree View - + Zur Strukturansicht wechseln Go to Document - + Zum Dokument wechseln @@ -1739,12 +1739,12 @@ Horizontal Bar - Anführungsstrich + Horizontaler Balken Figure Dash - Trennstrich für Nummern + Ziffernstrich @@ -1819,7 +1819,7 @@ Other Symbols - Andere Symbole + Andere Zeichen @@ -1909,7 +1909,7 @@ Footnote - + Fußnote @@ -2422,7 +2422,7 @@ Focus Character - Figur im Mittelpunkt + Charakter im Fokus @@ -2457,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title Titel - + Chapter Kapitel - + Scene Szene - + Section Abschnitt - + Document Dokument - + Status Status - + Characters Zeichen - + Words Wörter - + Paragraphs Absätze - + Synopsis Zusammenfassung - + Title Details Titeldetails - + Reference Tags Referenzen @@ -2522,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns Spalten anzeigen @@ -2548,7 +2548,7 @@ GuiOutlineTree - + Save Outline As Gliederung speichern @@ -2556,589 +2556,589 @@ GuiPreferences - - + + Preferences Einstellungen - + Search Suchen - + General Allgemein - + Appearance Darstellung - + Display language Anzeigesprache - - + + Requires restart to take effect. Neustart erforderlich. - + Colour theme Farbschema (Anwendung) - + General colour theme and icons. Allgemeines Farbschema und Icons. - + Application font - + Schriftart (Anwendung) - + Hide vertical scroll bars in main windows Vertikale Scrollbalken verbergen - - + + Scrolling available with mouse wheel and keys only. Beschränkt das Scrollen auf Mausrad und Tastatur. - + Hide horizontal scroll bars in main windows Horizontale Scrollbalken verbergen - + Use the system's font selection dialog - + Schriftauswahl des Betriebssystems verwenden - + Turn off to use the Qt font dialog, which may have more options. - + Deaktivieren, um die Qt-Schriftauswahl zu verwenden. Bietet möglicherweise mehr Optionen. - + Document Style Darstellung von Dokumenten - + Document colour theme Farbschema (Dokumente) - + Colour theme for the editor and viewer. Farbschema für Editor und Ansicht. - + Document font - + Schriftart (Dokument) - - - + + + Applies to both document editor and viewer. Gilt für Editor und Ansicht. - + Emphasise partition and chapter labels Dokumente mit höherer Hierarchie optisch hervorheben - + Makes them stand out in the project tree. Bessere Sichtbarkeit in der Strukturansicht. - + Show full path in document header Vollständige Dokumentenhierarchie im Editor anzeigen - + Add the parent folder names to the header. Zeigt die übergeordneten Elemente an. - + Include project notes in status bar word count Statusleiste: Wörter in Notizen mitzählen - + Auto Save Automatisch speichern - + Save document interval Dokument automatisch speichern - + How often the document is automatically saved. Wie oft das geöffnete Dokument automatisch gespeichert wird. - - + + seconds Sekunden - + Save project interval Projekt automatisch speichern - + How often the project is automatically saved. Wie oft das gesamte Projekt automatisch gespeichert wird. - + Project Backup Backups - + Browse Auswählen - + Backup storage location Verzeichnis für Backups - - + + Path: {0} Pfad: {0} - + Run backup when the project is closed Backup erstellen, wenn ein Projekt geschlossen wird - + Can be overridden for individual projects in Project Settings. Kann auch für einzelne Projekte in den Projekteinstellungen festgelegt werden. - + Ask before running backup Jedes Mal nachfragen, bevor ein Backup erstellt wird - + If off, backups will run in the background. Falls nein: Backups werden automatisch im Hintergrund erstellt. - + Session Timer Session-Timer - + Pause the session timer when not writing Den Timer bei Inaktivität pausieren - + Also pauses when the application window does not have focus. Pausiert auch, wenn das Programmfenster nicht den Fokus hat. - + Editor inactive time before pausing timer Pausiert nach Inaktivität - + User activity includes typing and changing the content. Dies berücksichtigt nur Änderungen im Texteditor. - + minutes Minuten - + Writing Schreiben - + Text Flow Textfluss - + Maximum text width in "Normal Mode" Maximale Textbreite im normalen Modus - + Set to 0 to disable this feature. „0“ deaktiviert diese Funktion. - - - - + + + + px px - + Maximum text width in "Focus Mode" Maximale Textbreite im Modus „Ablenkungsfrei“ - + The maximum width cannot be disabled. Die maximale Breite kann nicht deaktiviert werden. - + Hide document footer in "Focus Mode" Fußzeile verbergen im Modus „Ablenkungsfrei“ - + Hide the information bar in the document editor. Verbirgt die Informationsleiste im Editor. - + Justify the text margins Blocksatz - + Minimum text margin Mindestabstand nach außen - + Tab width Tabulator - + The width of a tab key press in the editor and viewer. Die Breite eines Tabulators im Editor und in der Ansicht. - + Text Editing Textbearbeitung - + Spell check language Rechtschreibprüfung - + Available languages are determined by your system. Verfügbare Sprachen werden vom Betriebssystem bereitgestellt. - + Auto-select word under cursor Wort mit Eingabezeiger gilt als „markiert“ - + Apply formatting to word under cursor if no selection is made. Wenn nichts markiert ist, werden Formatierung auf das Wort mit der Eingabemarke angewendet. - + Show tabs and spaces Tabs und Leerzeilen anzeigen - + Show line endings Zeilenende anzeigen - + Editor Scrolling Bildlauf im Editor - + Scroll past end of the document Am Ende des Dokuments weiterscrollen - + Also centres the cursor when scrolling. Eingabemarke wird beim Scrollen zentriert. - + Typewriter style scrolling when you type Wie mit einer Schreibmaschine scrollen - + Keeps the cursor at a fixed vertical position. Die Eingabemarke bleibt immer auf der gleichen Linie. - + Minimum position for Typewriter scrolling Mindesthöhe für den Schreibmaschinen-Effekt - + Percentage of the editor height from the top. Prozent der Editor-Höhe, von oben. - + Text Highlighting Hervorhebung - + None - Keine + Keine + + + + Single Quotes + Einfache Anführungszeichen + + + + Double Quotes + Doppelte Anführungszeichen - Single Quotes - - - - - Double Quotes - - - - Both - + Beide - + Highlight dialogue - + Wörtliche Rede hervorheben - + Applies to the selected quote styles. - + Wird für die ausgewählten Anführungszeichen angewendet. - + Allow open-ended dialogue - + Nicht geschlossene Anführungszeichen erlauben - + Highlight dialogue line with no closing quote. - + Wörtliche Rede ohne schließendes Anführungszeichen hervorheben. - + Dialogue narrator break symbol - + Zeichen für Erzählpause in wörtlicher Rede - + Symbol to indicate injected narrator break. - + Dieses Zeichen zeigt eine Unterbrechung der wörtlichen Rede an. - + Dialogue line symbol - + Zeichen für Dialogzeile - + Lines starting with this symbol are dialogue. - + Zeilen, die mit diesem Zeichen beginnen, als wörtliche Rede behandeln. - + Alternative dialogue symbols - + Alternative Zeichen für wörtliche Rede - + Custom highlighting of dialogue text. - + Benutzerdefinierte Hervorhebung von wörtlicher Rede. - + Add highlight colour to emphasised text Formatierten Text hervorheben - - + + Applies to the document editor only. Gilt nur für den Editor. - + Highlight multiple or trailing spaces Mehrere oder nachfolgende Leerzeichen hervorheben - + Text Automation Automatisierung - + Auto-replace text as you type Text automatisch ersetzen - + Allow the editor to replace symbols as you type. - Ermöglicht das Ersetzen von Symbolen während der Eingabe. + Ermöglicht das Ersetzen von Zeichen während der Eingabe. - + Auto-replace single quotes Einfache Anführungszeichen ersetzen - - + + Try to guess which is an opening or a closing quote. Öffnende und schließende Anführungszeichen werden automatisch erkannt. - + Auto-replace double quotes Doppelte Anführungszeichen ersetzen - + Auto-replace dashes Bindestriche ersetzen - + Double and triple hyphens become short and long dashes. Doppelte und dreifache Bindestriche werden zu Gedankenstrichen und Geviertstrichen umgewandelt. - + Auto-replace dots Punkte ersetzen - + Three consecutive dots become ellipsis. Drei aufeinander folgende Punkte werden zu Auslassungspunkten umgewandelt. - + Insert non-breaking space before Geschütztes Leerzeichen einfügen vor - + Automatically add space before any of these symbols. Vor diesen Zeichen wird automatisch ein Leerzeichen eingefügt. - + Insert non-breaking space after Geschütztes Leerzeichen einfügen nach - + Automatically add space after any of these symbols. Nach diesen Zeichen wird automatisch ein Leerzeichen eingefügt. - + Use thin space instead Schmales Leerzeichen verwenden - + Inserts a thin space instead of a regular space. Schmales Leerzeichen anstelle eines normalen Leerzeichens verwenden. - + Quotation Style Anführungszeichen - + Single quote open style Einfaches Anführungszeichen öffnend - + The symbol to use for a leading single quote. Beginn von wörtlicher Rede mit einfachen Anführungszeichen. - + Single quote close style Einfaches Anführungszeichen schließend - + The symbol to use for a trailing single quote. Ende von wörtlicher Rede mit einfachen Anführungszeichen. - + Double quote open style Doppeltes Anführungszeichen öffnend - + The symbol to use for a leading double quote. Beginn von wörtlicher Rede mit doppelten Anführungszeichen. - + Double quote close style Doppeltes Anführungszeichen schließend - + The symbol to use for a trailing double quote. Ende von wörtlicher Rede mit doppelten Anführungszeichen. - + Backup Directory Backup-Verzeichnis @@ -3372,7 +3372,7 @@ Select Quote Style - + Anführungszeichen auswählen @@ -3861,7 +3861,7 @@ Protagonist - Hauptfigur + Protagonist @@ -4039,7 +4039,7 @@ Select Font - + Schriftart auswählen @@ -4299,7 +4299,7 @@ Focus Character - Figur im Mittelpunkt + Charakter im Fokus @@ -4401,7 +4401,7 @@ Add a folder for character notes - Ordner hinzufügen: Notizen für Figuren + Ordner hinzufügen: Notizen für Charaktere @@ -4565,7 +4565,7 @@ No Preview - + Keine Vorschau @@ -4606,7 +4606,7 @@ Apply - Anwenden + Anwenden @@ -4774,27 +4774,27 @@ Circles ... - + Kreise ... Bars ... - + Balken ... Blocks ... - + Blöcke ... Shape - + Form Apply - Anwenden + Anwenden diff --git a/i18n/nw_en_US.ts b/i18n/nw_en_US.ts index cd879a34..3a6cd559 100644 --- a/i18n/nw_en_US.ts +++ b/i18n/nw_en_US.ts @@ -106,7 +106,7 @@ Text Font - + Text Font @@ -141,7 +141,7 @@ Apply Dialogue Highlighting - + Apply Dialog Highlighting @@ -151,17 +151,17 @@ Enable Indent - + Enable Indent Indent Width - + Indent Width Indent First Paragraph - + Indent First Paragraph @@ -535,102 +535,102 @@ Square - + Square Triangle - + Triangle Nabla - + Nabla Diamond - + Diamond Pentagon - + Pentagon Hexagon - + Hexagon Star - + Star Pacman - + Pacman 1/4 Circle - + 1/4 Circle Half Circle - + Half Circle 3/4 Circle - + 3/4 Circle Full Circle - + Full Circle 1 Bar - + 1 Bar 2 Bars - + 2 Bars 3 Bars - + 3 Bars 4 Bars - + 4 Bars 1 Block - + 1 Block 2 Blocks - + 2 Blocks 3 Blocks - + 3 Blocks 4 Blocks - + 4 Blocks @@ -1267,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel Show/Hide Viewer Panel - + Comments Comments - + Show Comments Show Comments - + Synopsis Synopsis - + Show Synopsis Comments Show Synopsis Comments @@ -1534,12 +1534,12 @@ Do you want to exit novelWriter? - + Some changes will not be applied until novelWriter has been restarted. Some changes will not be applied until novelWriter has been restarted. - + 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}. 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}. @@ -1684,12 +1684,12 @@ Go to Tree View - + Go to Tree View Go to Document - + Go to Document @@ -1909,7 +1909,7 @@ Footnote - + Footnote @@ -2457,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title Title - + Chapter Chapter - + Scene Scene - + Section Section - + Document Document - + Status Status - + Characters Characters - + Words Words - + Paragraphs Paragraphs - + Synopsis Synopsis - + Title Details Title Details - + Reference Tags Reference Tags @@ -2522,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns Select Columns @@ -2548,7 +2548,7 @@ GuiOutlineTree - + Save Outline As Save Outline As @@ -2556,589 +2556,589 @@ GuiPreferences - - + + Preferences Preferences - + Search Search - + General General - + Appearance Appearance - + Display language Display language - - + + Requires restart to take effect. Requires restart to take effect. - + Colour theme Color theme - + General colour theme and icons. General color theme and icons. - + Application font - + Application font - + Hide vertical scroll bars in main windows Hide vertical scroll bars in main windows - - + + Scrolling available with mouse wheel and keys only. Scrolling available with mouse wheel and keys only. - + Hide horizontal scroll bars in main windows Hide horizontal scroll bars in main windows - + Use the system's font selection dialog - + Use the system's font selection dialog - + Turn off to use the Qt font dialog, which may have more options. - + Turn off to use the Qt font dialog, which may have more options. - + Document Style Document Style - + Document colour theme Document color theme - + Colour theme for the editor and viewer. Color theme for the editor and viewer. - + Document font - + Document font - - - + + + Applies to both document editor and viewer. Applies to both document editor and viewer. - + Emphasise partition and chapter labels Emphasize partition and chapter labels - + Makes them stand out in the project tree. Makes them stand out in the project tree. - + Show full path in document header Show full path in document header - + Add the parent folder names to the header. Add the parent folder names to the header. - + Include project notes in status bar word count Include project notes in status bar word count - + Auto Save Auto Save - + Save document interval Save document interval - + How often the document is automatically saved. How often the document is automatically saved. - - + + seconds seconds - + Save project interval Save project interval - + How often the project is automatically saved. How often the project is automatically saved. - + Project Backup Project Backup - + Browse Browse - + Backup storage location Backup storage location - - + + Path: {0} Path: {0} - + Run backup when the project is closed Run backup when the project is closed - + Can be overridden for individual projects in Project Settings. Can be overridden for individual projects in Project Settings. - + Ask before running backup Ask before running backup - + If off, backups will run in the background. If off, backups will run in the background. - + Session Timer Session Timer - + Pause the session timer when not writing Pause the session timer when not writing - + Also pauses when the application window does not have focus. Also pauses when the application window does not have focus. - + Editor inactive time before pausing timer Editor inactive time before pausing timer - + User activity includes typing and changing the content. User activity includes typing and changing the content. - + minutes minutes - + Writing Writing - + Text Flow Text Flow - + Maximum text width in "Normal Mode" Maximum text width in "Normal Mode" - + Set to 0 to disable this feature. Set to 0 to disable this feature. - - - - + + + + px px - + Maximum text width in "Focus Mode" Maximum text width in "Focus Mode" - + The maximum width cannot be disabled. The maximum width cannot be disabled. - + Hide document footer in "Focus Mode" Hide document footer in "Focus Mode" - + Hide the information bar in the document editor. Hide the information bar in the document editor. - + Justify the text margins Justify the text margins - + Minimum text margin Minimum text margin - + Tab width Tab width - + The width of a tab key press in the editor and viewer. The width of a tab key press in the editor and viewer. - + Text Editing Text Editing - + Spell check language Spell check language - + Available languages are determined by your system. Available languages are determined by your system. - + Auto-select word under cursor Auto-select word under cursor - + Apply formatting to word under cursor if no selection is made. Apply formatting to word under cursor if no selection is made. - + Show tabs and spaces Show tabs and spaces - + Show line endings Show line endings - + Editor Scrolling Editor Scrolling - + Scroll past end of the document Scroll past end of the document - + Also centres the cursor when scrolling. Also centers the cursor when scrolling. - + Typewriter style scrolling when you type Typewriter style scrolling when you type - + Keeps the cursor at a fixed vertical position. Keeps the cursor at a fixed vertical position. - + Minimum position for Typewriter scrolling Minimum position for Typewriter scrolling - + Percentage of the editor height from the top. Percentage of the editor height from the top. - + Text Highlighting Text Highlighting - + None - None + None + + + + Single Quotes + Single Quotes + + + + Double Quotes + Double Quotes - Single Quotes - - - - - Double Quotes - - - - Both - + Both - + Highlight dialogue - + Highlight dialog - + Applies to the selected quote styles. - + Applies to the selected quote styles. - + Allow open-ended dialogue - + Allow open-ended dialog - + Highlight dialogue line with no closing quote. - + Highlight dialog line with no closing quote. - + Dialogue narrator break symbol - + Dialog narrator break symbol - + Symbol to indicate injected narrator break. - + Symbol to indicate injected narrator break. - + Dialogue line symbol - + Dialog line symbol - + Lines starting with this symbol are dialogue. - + Lines starting with this symbol are dialog. - + Alternative dialogue symbols - + Alternative dialog symbols - + Custom highlighting of dialogue text. - + Custom highlighting of dialog text. - + Add highlight colour to emphasised text Add highlight color to emphasised text - - + + Applies to the document editor only. Applies to the document editor only. - + Highlight multiple or trailing spaces Highlight multiple or trailing spaces - + Text Automation Text Automation - + Auto-replace text as you type Auto-replace text as you type - + Allow the editor to replace symbols as you type. Allow the editor to replace symbols as you type. - + Auto-replace single quotes Auto-replace single quotes - - + + Try to guess which is an opening or a closing quote. Try to guess which is an opening or a closing quote. - + Auto-replace double quotes Auto-replace double quotes - + Auto-replace dashes Auto-replace dashes - + Double and triple hyphens become short and long dashes. Double and triple hyphens become short and long dashes. - + Auto-replace dots Auto-replace dots - + Three consecutive dots become ellipsis. Three consecutive dots become ellipsis. - + Insert non-breaking space before Insert non-breaking space before - + Automatically add space before any of these symbols. Automatically add space before any of these symbols. - + Insert non-breaking space after Insert non-breaking space after - + Automatically add space after any of these symbols. Automatically add space after any of these symbols. - + Use thin space instead Use thin space instead - + Inserts a thin space instead of a regular space. Inserts a thin space instead of a regular space. - + Quotation Style Quotation Style - + Single quote open style Single quote open style - + The symbol to use for a leading single quote. The symbol to use for a leading single quote. - + Single quote close style Single quote close style - + The symbol to use for a trailing single quote. The symbol to use for a trailing single quote. - + Double quote open style Double quote open style - + The symbol to use for a leading double quote. The symbol to use for a leading double quote. - + Double quote close style Double quote close style - + The symbol to use for a trailing double quote. The symbol to use for a trailing double quote. - + Backup Directory Backup Directory @@ -3372,7 +3372,7 @@ Select Quote Style - + Select Quote Style @@ -4039,7 +4039,7 @@ Select Font - + Select Font @@ -4565,7 +4565,7 @@ No Preview - + No Preview @@ -4606,7 +4606,7 @@ Apply - Apply + Apply @@ -4774,27 +4774,27 @@ Circles ... - + Circles ... Bars ... - + Bars ... Blocks ... - + Blocks ... Shape - + Shape Apply - Apply + Apply diff --git a/i18n/nw_fr_FR.ts b/i18n/nw_fr_FR.ts index 853c809b..aaabf64d 100644 --- a/i18n/nw_fr_FR.ts +++ b/i18n/nw_fr_FR.ts @@ -106,7 +106,7 @@ Text Font - + Police du texte @@ -141,7 +141,7 @@ Apply Dialogue Highlighting - + Appliquer la mise en évidence pour les dialogues @@ -151,17 +151,17 @@ Enable Indent - + Activer l'indentation Indent Width - + Largeur de l'indentation Indent First Paragraph - + Indenter le premier paragraphe @@ -535,102 +535,102 @@ Square - + Carré Triangle - + Triangle Nabla - + Nabla Diamond - + Losange Pentagon - + Pentagone Hexagon - + Hexagone Star - + Étoile Pacman - + Pacman 1/4 Circle - + Quart de cercle Half Circle - + Demi-cercle 3/4 Circle - + Trois-quarts de cercle Full Circle - + Cercle entier 1 Bar - + Une barre 2 Bars - + Deux barres 3 Bars - + Trois barres 4 Bars - + Quatre barres 1 Block - + Un bloc 2 Blocks - + Deux blocs 3 Blocks - + Trois blocs 4 Blocks - + Quatre blocs @@ -1267,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel Afficher/Masquer le panneau de visualisation - + Comments Commentaires - + Show Comments Afficher les commentaires - + Synopsis Synopsis - + Show Synopsis Comments Afficher les commentaires du synopsis @@ -1534,12 +1534,12 @@ Voulez-vous sortir de novelWriter ? - + Some changes will not be applied until novelWriter has been restarted. Certains changements ne seront effectifs qu'après un redémarrage de 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}. La référence pour l'étiquette {0} n'a pas été trouvée. Soit elle n'existe pas, soit l'index n'est pas à jour. L'index peut être mis à jour depuis le menu des Outils, ou en appuyant sur {1}. @@ -1684,12 +1684,12 @@ Go to Tree View - + Aller à la vue arborescence Go to Document - + Aller au document @@ -1909,7 +1909,7 @@ Footnote - + Note de bas de page @@ -2457,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title Titre - + Chapter Chapitre - + Scene Scène - + Section Section - + Document Document - + Status État - + Characters Signes - + Words Mots - + Paragraphs Paragraphes - + Synopsis Synopsis - + Title Details Titre et Détails - + Reference Tags Etiquettes de référence @@ -2522,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns Sélectionner les colonnes @@ -2548,7 +2548,7 @@ GuiOutlineTree - + Save Outline As Enregistrer le résumé sous @@ -2556,589 +2556,589 @@ GuiPreferences - - + + Preferences Préférences - + Search Chercher - + General Général - + Appearance Apparence - + Display language Langue d'affichage - - + + Requires restart to take effect. Nécessite un redémarrage pour prendre effet. - + Colour theme Couleur du thème - + General colour theme and icons. Thème de couleur et icônes généraux. - + Application font - + Police de l'application - + Hide vertical scroll bars in main windows Masquer les barres de défilement verticales dans les fenêtres principales - - + + Scrolling available with mouse wheel and keys only. Le défilement ne pourra se faire que par la molette de la souris et les touches du clavier. - + Hide horizontal scroll bars in main windows Masquer les barres de défilement horizontales dans les fenêtres principales - + Use the system's font selection dialog - + Utiliser la boîte de dialogue du système pour les sélections de police - + Turn off to use the Qt font dialog, which may have more options. - + Désactivez pour utiliser la boîte de dialogue de police Qt, qui pourrait avoir plus d'options. - + Document Style Style du document - + Document colour theme Thème de couleur du document - + Colour theme for the editor and viewer. Thème de couleurs à utiliser dans l'éditeur et l'afficheur. - + Document font - + Police du document - - - + + + Applies to both document editor and viewer. S'applique à l'éditeur et à l'afficheur de documents. - + Emphasise partition and chapter labels Rehausser les étiquettes de parties et de chapitres - + Makes them stand out in the project tree. Les mettre en évidence dans l'arborescence du projet. - + Show full path in document header Montrer le chemin complet dans l'en-tête du document - + Add the parent folder names to the header. Ajouter les noms des dossiers parents dans l'en-tête. - + Include project notes in status bar word count Inclure les notes du projet dans le compte total de mots - + Auto Save Enregistrement automatique - + Save document interval Intervalle d'enregistrement - + How often the document is automatically saved. À quelle fréquence le document ouvert est automatiquement enregistré. - - + + seconds secondes - + Save project interval Intervalle d'enregistrement du projet - + How often the project is automatically saved. À quelle fréquence le projet ouvert est automatiquement enregistré. - + Project Backup Sauvegarde du projet - + Browse Parcourir - + Backup storage location Emplacement de sauvegarde du projet - - + + Path: {0} Chemin : {0} - + Run backup when the project is closed Sauvegarder à la fermeture du projet - + Can be overridden for individual projects in Project Settings. Peut être invalidé pour des projets spécifiques dans leurs paramètres. - + Ask before running backup Demander avant de sauvegarder - + If off, backups will run in the background. Si désactivé, les sauvegardes seront effectuées en arrière-plan. - + Session Timer Chronomètre de session - + Pause the session timer when not writing Arrêter le chronomètre quand on n'écrit pas - + Also pauses when the application window does not have focus. Arrêter également lorsque la fenêtre de l'application n'a pas le focus. - + Editor inactive time before pausing timer Durée d'inactivité de l'éditeur avant la mise en pause du chronomètre - + User activity includes typing and changing the content. L'activité de l'utilisateur inclut la frappe et la modification du contenu. - + minutes minutes - + Writing Ecriture - + Text Flow Déroulement du texte - + Maximum text width in "Normal Mode" Largeur maximale du texte en mode "normal" - + Set to 0 to disable this feature. Mettre à 0 pour désactiver cette fonctionnalité. - - - - + + + + px px - + Maximum text width in "Focus Mode" Largeur maximale du texte en mode "sans distraction" - + The maximum width cannot be disabled. La largeur maximale ne peut pas être désactivée. - + Hide document footer in "Focus Mode" Masquer le bas de page en mode "sans distraction" - + Hide the information bar in the document editor. Masquer la barre d'informations sous le document. - + Justify the text margins Justifier le texte aux marges - + Minimum text margin Marge minimale de texte - + Tab width Largeur des tabulations - + The width of a tab key press in the editor and viewer. La largeur résultant d'un appui sur la touche de tabulation dans l'éditeur et l'afficheur. - + Text Editing Édition de texte - + Spell check language Langue de vérification orthographique - + Available languages are determined by your system. Les langues disponibles dépendent de votre système. - + Auto-select word under cursor Auto-sélection du mot sous le curseur - + Apply formatting to word under cursor if no selection is made. En l'absence de texte sélectionné la mise en forme s'applique au mot sous le curseur. - + Show tabs and spaces Montrer les tabulations et les espaces - + Show line endings Montrer les fins de lignes - + Editor Scrolling Défilement de l'éditeur - + Scroll past end of the document Le défilement dépasse la fin du document - + Also centres the cursor when scrolling. Centre également le curseur lors du défilement. - + Typewriter style scrolling when you type Défilement de machine à écrire - + Keeps the cursor at a fixed vertical position. L'éditeur essaye de conserver le curseur à la même position verticale. - + Minimum position for Typewriter scrolling Position minimale en mode machine à écrire - + Percentage of the editor height from the top. En pourcentage de la hauteur de la fenêtre depuis le haut. - + Text Highlighting Surlignage du texte - + None - Aucun + Aucun(e) + + + + Single Quotes + Guillemets simples + + + + Double Quotes + Guillemets doubles - Single Quotes - - - - - Double Quotes - - - - Both - + Les deux - + Highlight dialogue - + Mettre les dialogues en évidence - + Applies to the selected quote styles. - + S'applique aux styles de guillemets sélectionnés. - + Allow open-ended dialogue - + Autoriser les dialogues sans guillemet final - + Highlight dialogue line with no closing quote. - + Mettre en évidence les lignes de dialogue sans guillemet fermant. - + Dialogue narrator break symbol - + Symbole indiquant une incise du narrateur - + Symbol to indicate injected narrator break. - + Symbole indiquant l'insertion d'une incise du narrateur. - + Dialogue line symbol - + Symbole de ligne de dialogue - + Lines starting with this symbol are dialogue. - + Les lignes qui débutent par ce symbole sont des dialogues. - + Alternative dialogue symbols - + Symboles de dialogue alternatifs - + Custom highlighting of dialogue text. - + Mise en évidence personnalisée du texte des dialogues. - + Add highlight colour to emphasised text Mettre en évidence le texte appuyé - - + + Applies to the document editor only. Ne s'applique qu'à l'éditeur de document. - + Highlight multiple or trailing spaces Surligner les espaces multiples ou terminaux - + Text Automation Automatisation de texte - + Auto-replace text as you type Auto-remplacement par la frappe - + Allow the editor to replace symbols as you type. Permet à l'éditeur de remplacer les symboles au fur et à mesure de la frappe. - + Auto-replace single quotes Auto-remplacement des guillemets simples - - + + Try to guess which is an opening or a closing quote. Tenter de deviner si un guillemet est ouvrant ou fermant. - + Auto-replace double quotes Auto-remplacement des guillemets doubles - + Auto-replace dashes Auto-remplacement des tirets - + Double and triple hyphens become short and long dashes. Deux ou trois tirets successifs deviennent des tirets moyens (semi-cadratins) ou longs (cadratins). - + Auto-replace dots Auto-remplacement des points - + Three consecutive dots become ellipsis. Trois points consécutifs deviennent des points de suspension. - + Insert non-breaking space before Espace insécable avant - + Automatically add space before any of these symbols. Ajouter lors de la frappe une espace avant chacun de ces caractères. - + Insert non-breaking space after Espace insécable après - + Automatically add space after any of these symbols. Ajouter lors de la frappe une espace après chacun de ces caractères. - + Use thin space instead Utiliser des espaces fines - + Inserts a thin space instead of a regular space. Insérer une espace fine au lieu d'une espace-mot. - + Quotation Style Style de guillemets - + Single quote open style Guillemets simples ouvrants - + The symbol to use for a leading single quote. Symbole à utiliser pour un guillemet simple ouvrant. - + Single quote close style Guillemets simples fermants - + The symbol to use for a trailing single quote. Symbole à utiliser pour un guillemet simple fermant. - + Double quote open style Guillemets doubles ouvrants - + The symbol to use for a leading double quote. Symbole à utiliser pour un guillemet double ouvrant. - + Double quote close style Guillemets doubles fermants - + The symbol to use for a trailing double quote. Symbole à utiliser pour un guillemet double fermant. - + Backup Directory Répertoire de sauvegarde @@ -3372,7 +3372,7 @@ Select Quote Style - + Sélectionner le style de guillemets @@ -4039,7 +4039,7 @@ Select Font - + Sélectionner la police @@ -4565,7 +4565,7 @@ No Preview - + Aucun aperçu @@ -4606,7 +4606,7 @@ Apply - Appliquer + Appliquer @@ -4774,27 +4774,27 @@ Circles ... - + Cercles... Bars ... - + Barres... Blocks ... - + Blocs... Shape - + Forme Apply - Appliquer + Appliquer diff --git a/i18n/nw_it_IT.ts b/i18n/nw_it_IT.ts index 301049ee..a263a582 100644 --- a/i18n/nw_it_IT.ts +++ b/i18n/nw_it_IT.ts @@ -106,7 +106,7 @@ Text Font - + Carattere del testo @@ -141,7 +141,7 @@ Apply Dialogue Highlighting - + Applica evidenziazione dialogo @@ -151,17 +151,17 @@ Enable Indent - + Abilita l'ndentazione Indent Width - + Larghezza dell'indentazione Indent First Paragraph - + Indenta il primo paragrafo @@ -535,102 +535,102 @@ Square - + Quadrato Triangle - + Triangolo Nabla - + Triangolo capovolto Diamond - + Diamante Pentagon - + Pentagono Hexagon - + Esagono Star - + Stella Pacman - + Pacman 1/4 Circle - + 1/4 di cerchio Half Circle - + Mezzo cerchio 3/4 Circle - + 3/4 di cerchio Full Circle - + Cerchio intero 1 Bar - + 1 barra 2 Bars - + 2 barre 3 Bars - + 3 barre 4 Bars - + 4 barre 1 Block - + 1 blocco 2 Blocks - + 2 blocchi 3 Blocks - + 3 blocchi 4 Blocks - + 4 blocchi @@ -1267,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel Mostra/Nascondi il Pannello di visualizzazione - + Comments Commenti - + Show Comments Mostra i commenti - + Synopsis Sinossi - + Show Synopsis Comments Mostra i commenti relativi alla sinossi @@ -1534,12 +1534,12 @@ Vuoi uscire da novelWriter? - + Some changes will not be applied until novelWriter has been restarted. Alcune modifiche non saranno applicate fino al riavvio di 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}. Impossibile trovare il riferimento per il tag '{0}'. O non esiste, o l'indice è obsoleto. L'indice può essere aggiornato dal menu Strumenti, o premendo {1}. @@ -1684,12 +1684,12 @@ Go to Tree View - + Vai alla vista ad albero Go to Document - + Vai al documento @@ -1909,7 +1909,7 @@ Footnote - + Nota a piè pagina @@ -2457,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title Titolo - + Chapter Capitolo - + Scene Scena - + Section Sezione - + Document Documento - + Status Stato - + Characters Caratteri - + Words Parole - + Paragraphs Paragrafi - + Synopsis Sinossi - + Title Details Dettagli Titolo - + Reference Tags Riferimenti @@ -2522,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns Seleziona colonne @@ -2548,7 +2548,7 @@ GuiOutlineTree - + Save Outline As Salva lo schema come @@ -2556,589 +2556,589 @@ GuiPreferences - - + + Preferences Preferenze - + Search Cerca - + General Generale - + Appearance Aspetto - + Display language Lingua dell'interfaccia - - + + Requires restart to take effect. Richiede il riavvio per avere effetto. - + Colour theme Tema colore - + General colour theme and icons. Colore del tema generale e icone. - + Application font - + Carattere dell'applicazione - + Hide vertical scroll bars in main windows Nascondi le barre di scorrimento verticali nelle finestre principali - - + + Scrolling available with mouse wheel and keys only. Scorrimento disponibile solo con la rotellina del mouse e i tasti. - + Hide horizontal scroll bars in main windows Nascondi le barre di scorrimento orizzontali nelle finestre principali - + Use the system's font selection dialog - + Usa la finestra di selezione dei caratteri del sistema - + Turn off to use the Qt font dialog, which may have more options. - + Disattiva per usare la finestra di dialogo dei caratteri Qt, che potrebbe avere più opzioni. - + Document Style Stile del documento - + Document colour theme Tema colore del documento - + Colour theme for the editor and viewer. Colore del tema per l'editor e il visualizzatore. - + Document font - + Carattere del documento - - - + + + Applies to both document editor and viewer. Si applica sia all'editor di documenti che al visualizzatore. - + Emphasise partition and chapter labels Evidenzia le etichette delle partizioni e dei capitoli - + Makes them stand out in the project tree. Le fa risaltare nell'albero del progetto. - + Show full path in document header Mostra il percorso completo nell'intestazione del documento - + Add the parent folder names to the header. Aggiunge i nomi delle cartelle di livello superiore all'intestazione. - + Include project notes in status bar word count Includi le note del progetto nel conteggio delle parole della barra di stato - + Auto Save Salvataggio automatico - + Save document interval Intervallo di salvataggio del documento - + How often the document is automatically saved. Quante volte il documento viene salvato automaticamente. - - + + seconds secondi - + Save project interval Intervallo di salvataggio del progetto - + How often the project is automatically saved. Quante volte il progetto viene salvato automaticamente. - + Project Backup Backup del progetto - + Browse Sfoglia - + Backup storage location Posizione di archiviazione del backup - - + + Path: {0} Percorso: {0} - + Run backup when the project is closed Esegui il backup quando il progetto è chiuso - + Can be overridden for individual projects in Project Settings. Può essere sovrascritto per singoli progetti nelle Impostazioni del progetto. - + Ask before running backup Chiedi prima di eseguire il backup - + If off, backups will run in the background. Se disattivato, i backup verranno eseguiti in background. - + Session Timer Timer della sessione - + Pause the session timer when not writing Metti in pausa il timer di sessione quando non si scrive - + Also pauses when the application window does not have focus. Inoltre si interrompe quando la finestra dell'applicazione non ha focus. - + Editor inactive time before pausing timer Tempo d'inattività dell'editor prima di mettere in pausa il timer - + User activity includes typing and changing the content. L'attività dell'utente include la digitazione e la modifica del contenuto. - + minutes minuti - + Writing Scrittura - + Text Flow Flusso del testo - + Maximum text width in "Normal Mode" Larghezza massima del testo in "Modalità normale" - + Set to 0 to disable this feature. Impostare a 0 per disabilitare questa funzione. - - - - + + + + px px - + Maximum text width in "Focus Mode" Larghezza massima del testo in "Modalità Focus" - + The maximum width cannot be disabled. La larghezza massima non può essere disabilitata. - + Hide document footer in "Focus Mode" Nascondi piè di pagina del documento in "Modalità Focus" - + Hide the information bar in the document editor. Nascondi la barra delle informazioni nell'editor dei documenti. - + Justify the text margins Giustifica i margini del testo - + Minimum text margin Dimensione minima del margine del testo - + Tab width Larghezza di tabulazione - + The width of a tab key press in the editor and viewer. La larghezza ottenibile con una pressione sul tasto TAB nell'editor e nel visualizzatore. - + Text Editing Modifica del testo - + Spell check language Lingua per il controllo ortografico - + Available languages are determined by your system. Le lingue disponibili sono determinate dal tuo sistema. - + Auto-select word under cursor Seleziona automaticamente la parola sotto il cursore - + Apply formatting to word under cursor if no selection is made. Applica la formattazione alla parola sotto il cursore se non viene effettuata alcuna selezione. - + Show tabs and spaces Mostra tabulazioni e spazi - + Show line endings Mostra terminazioni di riga - + Editor Scrolling Scorrimento dell'editor - + Scroll past end of the document Scorri alla fine del documento - + Also centres the cursor when scrolling. Centra anche il cursore durante lo scorrimento. - + Typewriter style scrolling when you type Scorrimento stile macchina da scrivere quando si digita - + Keeps the cursor at a fixed vertical position. Mantiene il cursore in posizione verticale fissa. - + Minimum position for Typewriter scrolling Posizione minima per lo scorrimento della macchina da scrivere - + Percentage of the editor height from the top. Percentuale dell'altezza dell'editor dall'alto. - + Text Highlighting Evidenziazione del testo - + None - Nessuno + Nessuno + + + + Single Quotes + Singole virgolette + + + + Double Quotes + Doppie virgolette - Single Quotes - - - - - Double Quotes - - - - Both - + Entrambe - + Highlight dialogue - + Evidenzia il dialogo - + Applies to the selected quote styles. - + Si applica agli stili di virgolette selezionati. - + Allow open-ended dialogue - + Consenti dialogo aperto - + Highlight dialogue line with no closing quote. - + Evidenzia la linea di dialogo senza virgolette di chiusura. - + Dialogue narrator break symbol - + Simbolo per il narratore del dialogo - + Symbol to indicate injected narrator break. - + Simbolo che indica l'inserimento di un dialogo da parte del narratore. - + Dialogue line symbol - + Simbolo della linea di dialogo - + Lines starting with this symbol are dialogue. - + Le righe che iniziano con questo simbolo sono dialogo. - + Alternative dialogue symbols - + Simboli di dialogo alternativi - + Custom highlighting of dialogue text. - + Evidenziazione personalizzata del testo del dialogo. - + Add highlight colour to emphasised text Aggiungi un colore per evidenziare ed enfatizzare il testo - - + + Applies to the document editor only. Si applica solo all'editor dei documenti. - + Highlight multiple or trailing spaces Evidenzia spazi multipli o finali - + Text Automation Automatismi del testo - + Auto-replace text as you type Sostituisci automaticamente il testo mentre digiti - + Allow the editor to replace symbols as you type. Consenti all'editor di sostituire i simboli durante la digitazione. - + Auto-replace single quotes Sostituisci automaticamente le virgolette singole - - + + Try to guess which is an opening or a closing quote. Prova a indovinare quale sia l'inizio o la fine di una citazione. - + Auto-replace double quotes Sostituisci automaticamente le virgolette doppie - + Auto-replace dashes Sostituisci automaticamente i trattini - + Double and triple hyphens become short and long dashes. I trattini doppi e tripli diventano brevi e lunghi trattini. - + Auto-replace dots Sostituisci automaticamente i puntini - + Three consecutive dots become ellipsis. Tre punti consecutivi diventano puntini di sospensione. - + Insert non-breaking space before Inserisci uno spazio prima di - + Automatically add space before any of these symbols. Aggiungi automaticamente spazio prima di uno di questi simboli. - + Insert non-breaking space after Inserisci uno spazio dopo di - + Automatically add space after any of these symbols. Aggiungi automaticamente uno spazio dopo uno di questi simboli. - + Use thin space instead Usa invece uno spazio sottile - + Inserts a thin space instead of a regular space. Inserisce uno spazio sottile invece di uno spazio regolare. - + Quotation Style Stile delle citazioni - + Single quote open style Singola virgoletta aperta - + The symbol to use for a leading single quote. Il simbolo da usare per una singola virgoletta iniziale. - + Single quote close style Singola virgoletta chiusa - + The symbol to use for a trailing single quote. Il simbolo da usare per una singola virgoletta finale. - + Double quote open style Doppie virgolette aperte - + The symbol to use for a leading double quote. Il simbolo da usare per avere doppie virgolette iniziali. - + Double quote close style Doppie virgolette chiuse - + The symbol to use for a trailing double quote. Il simbolo da usare per avere doppie virgolette finali. - + Backup Directory Percorso di backup @@ -3372,7 +3372,7 @@ Select Quote Style - + Seleziona lo stile delle virgolette @@ -4039,7 +4039,7 @@ Select Font - + Seleziona il tipo di carattere @@ -4565,7 +4565,7 @@ No Preview - + Nessuna anteprima @@ -4606,7 +4606,7 @@ Apply - Applica + Applica @@ -4774,27 +4774,27 @@ Circles ... - + Cerchi... Bars ... - + Barre ... Blocks ... - + Blocchi ... Shape - + Forma Apply - Applica + Applica diff --git a/i18n/nw_ja_JP.ts b/i18n/nw_ja_JP.ts index 85d0e17f..4c069948 100644 --- a/i18n/nw_ja_JP.ts +++ b/i18n/nw_ja_JP.ts @@ -106,7 +106,7 @@ Text Font - + テキストのフォント @@ -141,7 +141,7 @@ Apply Dialogue Highlighting - + 会話にハイライトを適用 @@ -151,17 +151,17 @@ Enable Indent - + インデントを有効 Indent Width - + インデントの幅 Indent First Paragraph - + 最初の段落をインデント @@ -535,102 +535,102 @@ Square - + 正方形 Triangle - + 三角形 Nabla - + 逆三角形 Diamond - + 菱形 Pentagon - + 五角形 Hexagon - + 六角形 Star - + 星 Pacman - + パックマン 1/4 Circle - + 1/4の円 Half Circle - + 半円 3/4 Circle - + 3/4の円 Full Circle - + 全円 1 Bar - + 1バー 2 Bars - + 2バー 3 Bars - + 3バー 4 Bars - + 4バー 1 Block - + 1ブロック 2 Blocks - + 2ブロック 3 Blocks - + 3ブロック 4 Blocks - + 4ブロック @@ -1267,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel ビューアーパネルの表示/非表示 - + Comments コメント - + Show Comments コメントを表示 - + Synopsis あらすじ - + Show Synopsis Comments あらすじコメントを表示 @@ -1534,12 +1534,12 @@ novelWriterを終了しますか？ - + Some changes will not be applied until novelWriter has been restarted. いくつかの変更は、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}. タグ '{0}' の参照が見つかりませんでした。タグが存在しないか、インデックスが古いかのどちらかです。インデックスはツールメニューから更新するか、{1} を押して更新することができます。 @@ -1684,12 +1684,12 @@ Go to Tree View - + ツリー ビューへ移動 Go to Document - + ドキュメントへ移動 @@ -1909,7 +1909,7 @@ Footnote - + 脚注 @@ -2457,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title タイトル - + Chapter チャプター - + Scene シーン - + Section セクション - + Document ドキュメント - + Status ステータス - + Characters 文字 - + Words 単語 - + Paragraphs 段落 - + Synopsis あらすじ - + Title Details タイトルの詳細 - + Reference Tags 参照タグ @@ -2522,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns 列の選択 @@ -2548,7 +2548,7 @@ GuiOutlineTree - + Save Outline As アウトラインを名前を付けて保存 @@ -2556,589 +2556,589 @@ GuiPreferences - - + + Preferences 環境設定 - + Search 検索 - + General 一般 - + Appearance 外観 - + Display language 表示言語 - - + + Requires restart to take effect. 有効にするには再起動が必要です。 - + Colour theme カラーテーマ - + General colour theme and icons. 一般的なカラーテーマとアイコン。 - + Application font - + アプリケーションのフォント - + Hide vertical scroll bars in main windows メインウィンドウの垂直スクロールバーを非表示 - - + + Scrolling available with mouse wheel and keys only. スクロールはマウスホイールとキーでのみ利用可能です。 - + Hide horizontal scroll bars in main windows メインウィンドウの横スクロールバーを非表示 - + Use the system's font selection dialog - + システムのフォント選択ダイアログを使用 - + Turn off to use the Qt font dialog, which may have more options. - + Qt フォントダイアログを使用するにはオフにしてください。 - + Document Style ドキュメントスタイル - + Document colour theme ドキュメントのカラーテーマ - + Colour theme for the editor and viewer. エディタとビューアーのカラーテーマ。 - + Document font - + ドキュメントのフォント - - - + + + Applies to both document editor and viewer. ドキュメントエディターとビューアーの両方に適用されます。 - + Emphasise partition and chapter labels パーティションとチャプターラベルを強調 - + Makes them stand out in the project tree. プロジェクトツリーで目立つようにします。 - + Show full path in document header ドキュメントヘッダーにフルパスを表示 - + Add the parent folder names to the header. 親フォルダ名をヘッダーに追加します。 - + Include project notes in status bar word count ステータスバーの単語数にプロジェクトノートを含める - + Auto Save 自動保存 - + Save document interval ドキュメントの保存間隔 - + How often the document is automatically saved. ドキュメントが自動的に保存される頻度。 - - + + seconds 秒 - + Save project interval プロジェクトの保存間隔 - + How often the project is automatically saved. プロジェクトが自動的に保存される頻度。 - + Project Backup プロジェクトのバックアップ - + Browse ブラウズ - + Backup storage location バックアップストレージの場所 - - + + Path: {0} パス: {0} - + Run backup when the project is closed プロジェクトを閉じたときにバックアップを実行 - + Can be overridden for individual projects in Project Settings. プロジェクト設定で個々のプロジェクトに対して上書きできます。 - + Ask before running backup バックアップを実行する前に確認 - + If off, backups will run in the background. オフの場合、バックアップはバックグラウンドで実行されます。 - + Session Timer セッションタイマー - + Pause the session timer when not writing 書き込んでいない時にセッションタイマーを一時停止 - + Also pauses when the application window does not have focus. また、アプリケーションウィンドウにフォーカスがない場合は一時停止します。 - + Editor inactive time before pausing timer タイマーを一時停止するまでのエディターの非アクティブ時間 - + User activity includes typing and changing the content. ユーザーアクティビティには、入力とコンテンツの変更が含まれます。 - + minutes 分 - + Writing 執筆 - + Text Flow テキストフロー - + Maximum text width in "Normal Mode" "ノーマルモード"でのテキストの最大幅 - + Set to 0 to disable this feature. この機能を無効にするには0に設定してください。 - - - - + + + + px px - + Maximum text width in "Focus Mode" "フォーカスモード"でのテキストの最大幅 - + The maximum width cannot be disabled. 最大幅を無効にすることはできません - + Hide document footer in "Focus Mode" "フォーカスモード"でドキュメントのフッターを非表示 - + Hide the information bar in the document editor. ドキュメントエディターで情報バーを非表示にします。 - + Justify the text margins テキストの余白を揃える - + Minimum text margin テキストの最小マージン - + Tab width タブの幅 - + The width of a tab key press in the editor and viewer. タブキーを押した時のエディターとプレービューでの幅。 - + Text Editing テキスト編集 - + Spell check language スペルチェック言語 - + Available languages are determined by your system. 利用可能な言語はシステムによって決定されます。 - + Auto-select word under cursor カーソルの下にある単語を自動選択 - + Apply formatting to word under cursor if no selection is made. 選択が行われていない場合は、カーソルの下にある単語に書式を適用します。 - + Show tabs and spaces タブとスペースを表示 - + Show line endings 行末を表示 - + Editor Scrolling エディタースクロール - + Scroll past end of the document ドキュメントの最後までスクロール - + Also centres the cursor when scrolling. また、スクロール時にカーソルを中央に移動します。 - + Typewriter style scrolling when you type 入力時にタイプライタースタイルスクロール - + Keeps the cursor at a fixed vertical position. カーソルを固定の垂直位置に維持します。 - + Minimum position for Typewriter scrolling タイプライタースクロールの最小位置 - + Percentage of the editor height from the top. エディタの高さの上からの割合。 - + Text Highlighting テキストのハイライト - + None - なし + なし + + + + Single Quotes + シングルクォート + + + + Double Quotes + ダブルクォート - Single Quotes - - - - - Double Quotes - - - - Both - + 両方 - + Highlight dialogue - + 会話のハイライト - + Applies to the selected quote styles. - + 選択したクォートスタイルに適用されます。 - + Allow open-ended dialogue - + 閉じない会話を許可 - + Highlight dialogue line with no closing quote. - + 終了引用符の無い会話行を強調表示します。 - + Dialogue narrator break symbol - + 会話ナレーターの区切り記号 - + Symbol to indicate injected narrator break. - + 挿入されたナレーターの区切りを示す記号です。 - + Dialogue line symbol - + 会話行記号 - + Lines starting with this symbol are dialogue. - + この記号で始まる行を会話とします。 - + Alternative dialogue symbols - + 代替会話記号 - + Custom highlighting of dialogue text. - + 会話テキストのカスタムハイライト。 - + Add highlight colour to emphasised text 強調テキストにハイライト色を追加 - - + + Applies to the document editor only. ドキュメントエディターにのみ適用されます。 - + Highlight multiple or trailing spaces 複数または末尾のスペースをハイライト表示 - + Text Automation テキストの自動化 - + Auto-replace text as you type 入力時にテキストを自動的に置き換え - + Allow the editor to replace symbols as you type. 入力時にエディタが記号を置き換えることを許可します。 - + Auto-replace single quotes シングルクォートの自動置換 - - + + Try to guess which is an opening or a closing quote. 引用符が開始と終了のどちらかを推測する - + Auto-replace double quotes ダブルクォートの自動置換 - + Auto-replace dashes ダッシュの自動置換 - + Double and triple hyphens become short and long dashes. 二重および三重のハイフンはenおよびemダッシュに置き換えらます。 - + Auto-replace dots ドットの自動置換 - + Three consecutive dots become ellipsis. ３つ連続したドットは省略記号に置き換えられます。 - + Insert non-breaking space before ノーブレークスペースを前に挿入 - + Automatically add space before any of these symbols. これらの記号の前にスペースを自動的に追加します。 - + Insert non-breaking space after ノーブレークスペースを後に挿入 - + Automatically add space after any of these symbols. これらの記号の後にスペースを自動的に追加します。 - + Use thin space instead 細いスペースを代わりに使用 - + Inserts a thin space instead of a regular space. 通常のスペースの代わりに細いスペースを挿入します。 - + Quotation Style クォーテーションスタイル - + Single quote open style シングルクォートオープンスタイル - + The symbol to use for a leading single quote. 先頭のシングルクォートに使用する記号です。 - + Single quote close style シングルクォートクローズスタイル - + The symbol to use for a trailing single quote. 末尾のシングルクォートに使用する記号です。 - + Double quote open style ダブルクォートオープンスタイル - + The symbol to use for a leading double quote. 先頭のダブルクォートに使用する記号です。 - + Double quote close style シングルクォートクローズスタイル - + The symbol to use for a trailing double quote. 末尾のダブルクォートに使用する記号です。 - + Backup Directory バックアップディレクトリー @@ -3372,7 +3372,7 @@ Select Quote Style - + クォートスタイルを選択 @@ -4039,7 +4039,7 @@ Select Font - + フォントを選択 @@ -4565,7 +4565,7 @@ No Preview - + プレビューなし @@ -4606,7 +4606,7 @@ Apply - 適用 + 適用 @@ -4774,27 +4774,27 @@ Circles ... - + 円... Bars ... - + バー... Blocks ... - + ブロック... Shape - + 形状 Apply - 適用 + 適用 diff --git a/i18n/nw_nb_NO.ts b/i18n/nw_nb_NO.ts index 4ee4e1e7..a09d669b 100644 --- a/i18n/nw_nb_NO.ts +++ b/i18n/nw_nb_NO.ts @@ -106,7 +106,7 @@ Text Font - + Skrifttype @@ -141,7 +141,7 @@ Apply Dialogue Highlighting - + Fremhev dialogtekst @@ -151,17 +151,17 @@ Enable Indent - + Aktiver innrykk Indent Width - + Innrykkets bredde Indent First Paragraph - + Innrykk på første avsnitt @@ -535,102 +535,102 @@ Square - + Kvadrat Triangle - + Trekant Nabla - + Nabla Diamond - + Diamant Pentagon - + Pentagon Hexagon - + Heksagon Star - + Stjerne Pacman - + Pacman 1/4 Circle - + 1/4 sirkel Half Circle - + Halv sirkel 3/4 Circle - + 3/4 sirkel Full Circle - + Hel sirkel 1 Bar - + 1 strek 2 Bars - + 2 streker 3 Bars - + 3 streker 4 Bars - + 4 streker 1 Block - + 1 kloss 2 Blocks - + 2 klosser 3 Blocks - + 3 klosser 4 Blocks - + 4 klosser @@ -1267,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel Vis/skjul visningspanelet - + Comments Kommentarer - + Show Comments Vis kommentarer - + Synopsis Sammendrag - + Show Synopsis Comments Vis sammendrag @@ -1534,12 +1534,12 @@ Ønsker du å avslutte novelWriter? - + Some changes will not be applied until novelWriter has been restarted. Noen endringer vil ikke tas i bruk før neste gang novelWriter startes. - + 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}. Kunne ikke finne referansen til knagg {0}. Enten finnes den ikke, eller så er prosjektets indeks ikke oppdatert. Indeksen kan oppdateres fra Verktøy-menyen eller ved å trykke på {1}. @@ -1684,12 +1684,12 @@ Go to Tree View - + Gå til prosjekt Go to Document - + Gå til dokument @@ -1909,7 +1909,7 @@ Footnote - + Fotnote @@ -2457,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title Tittel - + Chapter Kapittel - + Scene Scene - + Section Seksjon - + Document Dokument - + Status Status - + Characters Tegn - + Words Ord - + Paragraphs Avsnitt - + Synopsis Sammendrag - + Title Details Oversikt - + Reference Tags Referanser @@ -2522,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns Velg kolonner @@ -2548,7 +2548,7 @@ GuiOutlineTree - + Save Outline As Lagre disposisjon som @@ -2556,589 +2556,589 @@ GuiPreferences - - + + Preferences Innstillinger - + Search Søk - + General Generelt - + Appearance Utseende - + Display language Visningspråk - - + + Requires restart to take effect. Krever omstart for å tre i kraft. - + Colour theme Fargetema - + General colour theme and icons. Generelt fargetema og ikoner. - + Application font - + Applikasjonens skrifttype - + Hide vertical scroll bars in main windows Skjul vertikale rullefelt i hovedvinduer - - + + Scrolling available with mouse wheel and keys only. Rulling kan bare gjøres med mus og tastatur. - + Hide horizontal scroll bars in main windows Skjul horisontale rullefelt i hovedvinduer - + Use the system's font selection dialog - + Bruk operativsystemets dialog for skriftvalg - + Turn off to use the Qt font dialog, which may have more options. - + Slå av for istedet bruker Qt sin dialog for skrifttype, som kan ha flere valg. - + Document Style Dokumentets stil - + Document colour theme Dokumentets fargetema - + Colour theme for the editor and viewer. Fargetema for redigering og visning. - + Document font - + Dokumentets skrifttype - - - + + + Applies to both document editor and viewer. Gjelder både redigerings- og visningsvindu. - + Emphasise partition and chapter labels Fremhev filnavn for inndeling og kapitler - + Makes them stand out in the project tree. Får dem til å skille seg ut i prosjekttreet. - + Show full path in document header Vis full prosjektbane i dokumenthoder - + Add the parent folder names to the header. Legger til mappene foran dokumentets navn. - + Include project notes in status bar word count Inkluder prosjektnotater i antallet ord i statuslinjen - + Auto Save Automatisk lagring - + Save document interval Intervall for lagring av dokument - + How often the document is automatically saved. Hvor ofte dokumentet lagres automatisk. - - + + seconds sekunder - + Save project interval Intervall for lagring av prosjekt - + How often the project is automatically saved. Hvor ofte prosjektet lagres automatisk. - + Project Backup Sikkerhetskopi - + Browse Bla - + Backup storage location Filbane for sikkerhetskopi - - + + Path: {0} Filbane: {0} - + Run backup when the project is closed Lag sikkerhetskopi når prosjektet lukkes - + Can be overridden for individual projects in Project Settings. Kan overstyres fra individuelle prosjektinnstillinger. - + Ask before running backup Spør før sikkerhetskopi tas - + If off, backups will run in the background. Hvis avslått, tas sikkerhetskopi automatisk. - + Session Timer Sesjons-klokke - + Pause the session timer when not writing Sett klokka på pause når du er inaktiv - + Also pauses when the application window does not have focus. Pauses også når du ikke jobber i applikasjonens vindu. - + Editor inactive time before pausing timer Tid uten skriving før klokka settes på pause - + User activity includes typing and changing the content. Dette måler kun endringer i teksteditoren. - + minutes minutter - + Writing Skriving - + Text Flow Tekstflyt - + Maximum text width in "Normal Mode" Maks tekstbredde i "Normal-modus" - + Set to 0 to disable this feature. Sett til 0 for å deaktivere denne funksjonen. - - - - + + + + px px - + Maximum text width in "Focus Mode" Maks tekstbredde i "Fokus-modus" - + The maximum width cannot be disabled. Denne maks-bredden kan ikke deaktiveres. - + Hide document footer in "Focus Mode" Gjem dokumentets bunnlinje i "Fokus-modus" - + Hide the information bar in the document editor. Skjul informasjonslinjen i dokumenteditoren. - + Justify the text margins Juster tekstmarginer - + Minimum text margin Minimum tekstmargin - + Tab width Tabulatorens bredde - + The width of a tab key press in the editor and viewer. Hvor langt tabulatoren hopper i editor og visning. - + Text Editing Redigering av tekst - + Spell check language Språk for stavekontroll - + Available languages are determined by your system. Tilgjengelige språk hentes fra operativystemet ditt. - + Auto-select word under cursor Auto-velg ord under markør - + Apply formatting to word under cursor if no selection is made. Hvis ingen tekst er valgt, formatter ordet hvor markøren står. - + Show tabs and spaces Synlige tabulatorer og mellomrom - + Show line endings Synlige linjeender - + Editor Scrolling Tekstbehandler rulling - + Scroll past end of the document Tillat å rulle forbi slutten av dokumentet - + Also centres the cursor when scrolling. Sentrerer også markøren når man ruller. - + Typewriter style scrolling when you type Skrivemaskin-liknende rulling mens du skriver - + Keeps the cursor at a fixed vertical position. Holder markøren på samme sted vertikalt. - + Minimum position for Typewriter scrolling Minste avstand for skrivemaskin-rulling - + Percentage of the editor height from the top. I prosent fra toppen av editor-vinduet. - + Text Highlighting Fremheving - + None - Ingen + Ingen + + + + Single Quotes + Enkle anførselstegn + + + + Double Quotes + Doble anførselstegn - Single Quotes - - - - - Double Quotes - - - - Both - + Begge typer - + Highlight dialogue - + Fremhev dialog - + Applies to the selected quote styles. - + Gjelder alle de valgte anførselstegn. - + Allow open-ended dialogue - + Tillat anførselstegn som ikke lukkes - + Highlight dialogue line with no closing quote. - + Fremhev dialog som ikke er lukket i samme avsnitt. - + Dialogue narrator break symbol - + Tegn for fortellerpause i dialog - + Symbol to indicate injected narrator break. - + Tegnet som indikerer fortellerpause i teksten. - + Dialogue line symbol - + Tegn for dialoglinje - + Lines starting with this symbol are dialogue. - + En linje som starter med dette tegnet anses som dialog. - + Alternative dialogue symbols - + Symboler for alternativ dialog - + Custom highlighting of dialogue text. - + Egendefinert fremheving av dialog. - + Add highlight colour to emphasised text Fremhev formattert tekst - - + + Applies to the document editor only. Gjelder bare for redigeringsvindu. - + Highlight multiple or trailing spaces Fremhev flere eller etterfølgende mellomrom - + Text Automation Tekstautomatisering - + Auto-replace text as you type Erstatt mens du skriver - + Allow the editor to replace symbols as you type. Erstatt symboler mens du skriver. - + Auto-replace single quotes Erstatt enkle sitattegn - - + + Try to guess which is an opening or a closing quote. Prøv å gjette om det er et åpne- eller lukketegn. - + Auto-replace double quotes Erstatt doble sitattegn - + Auto-replace dashes Erstatt bindestreker - + Double and triple hyphens become short and long dashes. To og tre bindestreker erstattes med kort og lang bindestrek. - + Auto-replace dots Erstatt tre punktum - + Three consecutive dots become ellipsis. Tre punktum på rad erstattes med ellipsis. - + Insert non-breaking space before Sett inn hardt mellomrom foran - + Automatically add space before any of these symbols. Legg til mellomrom automatisk foran disse tegnene. - + Insert non-breaking space after Sett inn hardt mellomrom etter - + Automatically add space after any of these symbols. Legg til mellomrom automatisk etter disse tegnene. - + Use thin space instead Bruk tynt mellomrom istedet - + Inserts a thin space instead of a regular space. Sett inn et tynt mellomrom istedenfor et vanlig et. - + Quotation Style Sitattegn - + Single quote open style Enkelt sitat, venstre side - + The symbol to use for a leading single quote. Symbol for enkelt sitattegn før et sitat. - + Single quote close style Enkelt sitat, høyre side - + The symbol to use for a trailing single quote. Symbol for enkelt sitattegn etter et sitat. - + Double quote open style Dobbelt sitat, venstre side - + The symbol to use for a leading double quote. Symbol for dobbelt sitattegn før et sitat. - + Double quote close style Dobbelt sitat, høyre side - + The symbol to use for a trailing double quote. Symbol for dobbelt sitattegn etter et sitat. - + Backup Directory Mappe for sikkerhetskopi @@ -3372,7 +3372,7 @@ Select Quote Style - + Velg anførselstegn @@ -4039,7 +4039,7 @@ Select Font - + Velg skrifttype @@ -4565,7 +4565,7 @@ No Preview - + Ingen forhåndsvisning @@ -4606,7 +4606,7 @@ Apply - Anvend + Bruk @@ -4774,27 +4774,27 @@ Circles ... - + Sirkler ... Bars ... - + Streker ... Blocks ... - + Klosser ... Shape - + Former Apply - Anvend + Bruk diff --git a/i18n/nw_nl_NL.ts b/i18n/nw_nl_NL.ts index eb170d03..43d2cc21 100644 --- a/i18n/nw_nl_NL.ts +++ b/i18n/nw_nl_NL.ts @@ -106,7 +106,7 @@ Text Font - + Lettertype @@ -141,7 +141,7 @@ Apply Dialogue Highlighting - + Pas dialoog markering toe @@ -151,17 +151,17 @@ Enable Indent - + Inspringen inschakelen Indent Width - + Inspringen breedte Indent First Paragraph - + Eerste alinea inspringen @@ -535,102 +535,102 @@ Square - + Vierkant Triangle - + Driehoek Nabla - + Nabla Diamond - + Diamant Pentagon - + Pentagon Hexagon - + Zeshoek Star - + Ster Pacman - + Pacman 1/4 Circle - + 1/4 cirkel Half Circle - + Halve cirkel 3/4 Circle - + 3/4 cirkel Full Circle - + Volledige cirkel 1 Bar - + 1 staaf 2 Bars - + 2 staven 3 Bars - + 3 staven 4 Bars - + 4 staven 1 Block - + 1 blok 2 Blocks - + 2 blokken 3 Blocks - + 3 blokken 4 Blocks - + 4 blokken @@ -1267,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel Toon/verberg bekijker paneel - + Comments Opmerkingen - + Show Comments Opmerkingen weergeven - + Synopsis Synopsis - + Show Synopsis Comments Toon synopsis commentaren @@ -1534,12 +1534,12 @@ Wil je novelWriter afsluiten? - + Some changes will not be applied until novelWriter has been restarted. Sommige wijzigingen zullen niet worden toegepast totdat novelWriter opnieuw is gestart. - + 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}. Kon de verwijzing voor tag '{0}' niet vinden. Hij bestaat niet of de index is verouderd. De index kan worden bijgewerkt in het Hulpmiddelen menu, of door op {1} te drukken. @@ -1684,12 +1684,12 @@ Go to Tree View - + Ga naar Boomweergave Go to Document - + Ga naar document @@ -1909,7 +1909,7 @@ Footnote - + Voetnoot @@ -2457,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title Titel - + Chapter Hoofdstuk - + Scene Scène - + Section Sectie - + Document Document - + Status Status - + Characters Tekens - + Words Woorden - + Paragraphs Paragrafen - + Synopsis Synopsis - + Title Details Titel Details - + Reference Tags Referentie Tags @@ -2522,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns Selecteer Kolommen @@ -2548,7 +2548,7 @@ GuiOutlineTree - + Save Outline As Sla omlijning op als @@ -2556,589 +2556,589 @@ GuiPreferences - - + + Preferences Voorkeuren - + Search Zoek - + General Algemeen - + Appearance Uiterlijk - + Display language Weergavetaal - - + + Requires restart to take effect. Vereist herstart om van kracht te worden. - + Colour theme Kleurenthema - + General colour theme and icons. Algemene kleuren thema en iconen. - + Application font - + Applicatie lettertype - + Hide vertical scroll bars in main windows Verticale schuifbalken in hoofdvensters verbergen - - + + Scrolling available with mouse wheel and keys only. Scrollen alleen beschikbaar met muiswiel en toetsen. - + Hide horizontal scroll bars in main windows Verberg horizontale schuifbalken in hoofdvensters - + Use the system's font selection dialog - + Gebruik de lettertype keuze dialoog van het systeem - + Turn off to use the Qt font dialog, which may have more options. - + Schakel uit om het Qt lettertype dialoogvenster te gebruiken, welke mogelijk meer opties heeft. - + Document Style Document stijl - + Document colour theme Document kleurenthema - + Colour theme for the editor and viewer. Kleur thema voor de tekstbewerker en kijker. - + Document font - + Lettertype document - - - + + + Applies to both document editor and viewer. Van toepassing op zowel de documentbewerker als de kijker. - + Emphasise partition and chapter labels Partitie en hoofdstuk labels benadrukken - + Makes them stand out in the project tree. Laat ze opvallen in de projectboom. - + Show full path in document header Volledig pad in document kop weergeven - + Add the parent folder names to the header. Voeg de bovenliggende mapnamen toe aan de kop. - + Include project notes in status bar word count Project notities opnemen in de statusbalk woord telling - + Auto Save Automatisch opslaan - + Save document interval Document opslag interval - + How often the document is automatically saved. Hoe vaak het document automatisch wordt opgeslagen. - - + + seconds seconden - + Save project interval Project opslag interval - + How often the project is automatically saved. Hoe vaak het project automatisch wordt opgeslagen. - + Project Backup Project Reservekopie - + Browse Blader - + Backup storage location Opslaglocatie voor reservekopie - - + + Path: {0} Pad: {0} - + Run backup when the project is closed Reservekopie maken wanneer het project wordt gesloten - + Can be overridden for individual projects in Project Settings. Kan voor individuele projecten overschreven worden in Projectinstellingen. - + Ask before running backup Vraag voor het maken van een reservekopie - + If off, backups will run in the background. Indien uit, worden reservekopieën op de achtergrond gemaakt. - + Session Timer Sessie Timer - + Pause the session timer when not writing De sessie timer pauzeren wanneer niet geschreven wordt - + Also pauses when the application window does not have focus. Pauzeert ook wanneer het toepassingsvenster geen focus heeft. - + Editor inactive time before pausing timer Inactieve tekstbewerker duur voordat timer wordt gepauzeerd - + User activity includes typing and changing the content. Gebruikersactiviteit omvat typen en het wijzigen van de inhoud. - + minutes minuten - + Writing Schrijven - + Text Flow Tekst Flow - + Maximum text width in "Normal Mode" Maximale tekstbreedte in "Normale Modus" - + Set to 0 to disable this feature. Stel in op 0 om deze functie uit te schakelen. - - - - + + + + px px - + Maximum text width in "Focus Mode" Maximale tekstbreedte in "Focus Modus" - + The maximum width cannot be disabled. De maximale breedte kan niet worden uitgeschakeld. - + Hide document footer in "Focus Mode" Verberg document voettekst in "Focus Modus" - + Hide the information bar in the document editor. Verberg de informatiebalk in de documentbewerker. - + Justify the text margins De tekstmarges uitvullen - + Minimum text margin Minimale tekstmarge - + Tab width Tab breedte - + The width of a tab key press in the editor and viewer. De breedte van een tab teken in de tekstbewerker en kijker. - + Text Editing Tekstbewerking - + Spell check language Taal voor spellingscontrole - + Available languages are determined by your system. Beschikbare talen worden bepaald door uw systeem. - + Auto-select word under cursor Automatisch woord onder cursor selecteren - + Apply formatting to word under cursor if no selection is made. Opmaak toepassen op woord onder de cursor als er geen selectie is gemaakt. - + Show tabs and spaces Tabs en spaties weergeven - + Show line endings Regeleindes weergeven - + Editor Scrolling Bewerker scrollen - + Scroll past end of the document Scroll voorbij het einde van het document - + Also centres the cursor when scrolling. Centreer ook de cursor bij het scrollen. - + Typewriter style scrolling when you type Schrijfmachine stijl scrollen bij het typen - + Keeps the cursor at a fixed vertical position. Houd de cursor op een vaste verticale positie. - + Minimum position for Typewriter scrolling Minimumpositie voor Schrijfmachine scrollen - + Percentage of the editor height from the top. Percentage van de tekstverwerker hoogte vanaf de bovenkant. - + Text Highlighting Tekstmarkering - + None - Geen + Geen + + + + Single Quotes + Enkele aanhalingstekens + + + + Double Quotes + Dubbele aanhalingstekens - Single Quotes - - - - - Double Quotes - - - - Both - + Beide - + Highlight dialogue - + Dialoog markeren - + Applies to the selected quote styles. - + Van toepassing op de geselecteerde aanhalingsteken stijlen. - + Allow open-ended dialogue - + Toestaan van open einde dialoog - + Highlight dialogue line with no closing quote. - + Markeer de dialoog regel zonder afsluitend aanhalingsteken. - + Dialogue narrator break symbol - + Dialoog verteller breuksymbool - + Symbol to indicate injected narrator break. - + Symbool om geïnjecteerde verteller breuk aan te geven. - + Dialogue line symbol - + Dialoogregel symbool - + Lines starting with this symbol are dialogue. - + Regels die beginnen met dit symbool zijn dialoog. - + Alternative dialogue symbols - + Alternatieve dialoogsymbolen - + Custom highlighting of dialogue text. - + Aangepaste markering van dialoogtekst. - + Add highlight colour to emphasised text Voeg markeerkleur toe aan geaccentueerde tekst - - + + Applies to the document editor only. Alleen van toepassing op de tekst bewerker. - + Highlight multiple or trailing spaces Markeer meerdere of afsluitende spaties - + Text Automation Tekstautomatisering - + Auto-replace text as you type Automatisch tekst vervangen terwijl u typt - + Allow the editor to replace symbols as you type. Sta de tekstbewerker toe om symbolen te vervangen terwijl u typt. - + Auto-replace single quotes Automatisch enkele aanhalingstekens vervangen - - + + Try to guess which is an opening or a closing quote. Probeer te raden wat een openend of afsluitend aanhalingsteken is. - + Auto-replace double quotes Automatisch dubbele aanhalingstekens vervangen - + Auto-replace dashes Automatisch streepjes vervangen - + Double and triple hyphens become short and long dashes. Dubbele en drievoudige koppeltekens worden korte en lange streepjes. - + Auto-replace dots Automatisch stippen vervangen - + Three consecutive dots become ellipsis. Drie opeenvolgende stippen worden ellips. - + Insert non-breaking space before Vaste spatie invoegen voor - + Automatically add space before any of these symbols. Voeg automatisch een spatie toe voor één van deze symbolen. - + Insert non-breaking space after Vaste spatie invoegen na - + Automatically add space after any of these symbols. Voeg automatisch een spatie toe na één van deze symbolen. - + Use thin space instead Gebruik dunne spatie in plaats van - + Inserts a thin space instead of a regular space. Voegt een dunne spatie toe in plaats van een normale spatie. - + Quotation Style Citeer Stijl - + Single quote open style Enkel aanhalingsteken open stijl - + The symbol to use for a leading single quote. Het symbool om te gebruiken voor een leidend enkel aanhalingsteken. - + Single quote close style Enkel aanhalingsteken sluit stijl - + The symbol to use for a trailing single quote. Het symbool om te gebruiken voor een afsluitend enkel aanhalingsteken. - + Double quote open style Dubbele aanhalingsteken open stijl - + The symbol to use for a leading double quote. Het symbool om te gebruiken voor een leidend dubbel aanhalingsteken. - + Double quote close style Dubbel aanhalingsteken sluit stijl - + The symbol to use for a trailing double quote. Het symbool om te gebruiken voor een afsluitend dubbel aanhalingsteken. - + Backup Directory Reservekopie map @@ -3372,7 +3372,7 @@ Select Quote Style - + Selecteer aanhalingsteken stijl @@ -4039,7 +4039,7 @@ Select Font - + Selecteer lettertype @@ -4565,7 +4565,7 @@ No Preview - + Geen voorvertoning @@ -4606,7 +4606,7 @@ Apply - Toepassen + Toepassen @@ -4774,27 +4774,27 @@ Circles ... - + Cirkels ... Bars ... - + Staven ... Blocks ... - + Blokken ... Shape - + Vorm Apply - Toepassen + Toepassen diff --git a/i18n/nw_pl_PL.ts b/i18n/nw_pl_PL.ts new file mode 100644 index 00000000..e5674275 --- /dev/null +++ b/i18n/nw_pl_PL.ts @@ -0,0 +1,4988 @@ + + + + + Builds + + + Document Filters + Filtry dokumentów + + + + Novel Documents + Dokumenty powieści + + + + Project Notes + Notatki projektu + + + + Inactive Documents + Dokumenty nieaktywne + + + + Headings + Nagłówki + + + + Partition Format + Formatowanie części + + + + Chapter Format + Formatowanie rozdziału + + + + Unnumbered Format + Formatowanie rozdziału nienumerowanego + + + + Scene Format + Formatowanie sceny + + + + Alt. Scene Format + Formatowanie sceny alternatywnej + + + + Section Format + Formatowanie sekcji + + + + Text Content + Zawartość tekstowa + + + + Include Synopsis + Uwzględnij streszczenie + + + + Include Comments + Uwzględnij komentarze + + + + Include Keywords + Uwzględnij słowa kluczowe + + + + Include Body Text + Uwzględnij tekst główny + + + + Ignore These Keywords + Ignoruj następujące słowa kluczowe + + + + Insert Content + Wstaw zawartość + + + + Add Titles for Notes + Dodaj tytuły notatek + + + + Text Format + Format tekstu + + + + Text Font + Czcionka tekstu + + + + Line Height + Wysokość wiersza + + + + Text Options + Opcje tekstu + + + + Justify Text Margins + Wyjustuj marginesy tekstu + + + + Replace Unicode Characters + Zastąp znaki Unicode + + + + Replace Tabs with Spaces + Zastąp znaki tabulacji spacjami + + + + Preserve Hard Line Breaks + Zachowaj przełamania wiersza + + + + Apply Dialogue Highlighting + Zastosuj wyróżnianie dialogów + + + + First Line Indent + Wcięcie pierwszego wiersza + + + + Enable Indent + Stosuj wcięcia wiersza + + + + Indent Width + Szerokość wcięcia wiersza + + + + Indent First Paragraph + Wcięcie pierwszego akapitu + + + + Page Layout + Układ strony + + + + Unit + Jednostka + + + + Page Size + Wielkość strony + + + + Page Width + Szerokość strony + + + + Page Height + Wysokość strony + + + + Top Margin + Górny margines + + + + Bottom Margin + Dolny margines + + + + Left Margin + Lewy margines + + + + Right Margin + Prawy margines + + + + Open Document (.odt) + Open Document (.odt) + + + + Add Highlight Colours + Dodaj kolory wyróżnienia + + + + Page Header + Nagłówek strony + + + + Page Counter Offset + Przesunięcie licznika stron + + + + HTML (.html) + HTML (.html) + + + + Add CSS Styles + Dodaj style CSS + + + + Preserve Tab Characters + Zachowaj znaki tabulacji + + + + Common + + + in the future + w przyszłości + + + + just now + teraz + + + + a minute ago + minutę temu + + + + {0} minutes ago + {0} minut temu + + + + an hour ago + godzinę temu + + + + {0} hours ago + {0} godzin temu + + + + a day ago + poprzedniego dnia + + + + {0} days ago + {0} dni temu + + + + a week ago + tydzień temu + + + + {0} weeks ago + {0} tygodni temu + + + + a month ago + miesiąc temu + + + + {0} months ago + {0} miesięcy temu + + + + a year ago + rok temu + + + + {0} years ago + {0} lat temu + + + + Constant + + + + + None + NIC + + + + Novel + Powieść + + + + + Plot + Fabuła + + + + + Characters + Postacie + + + + + Locations + Miejsca + + + + + Timeline + Linia czasu + + + + + Objects + Obiekty + + + + + Entities + Podmioty + + + + + + Custom + Różne + + + + Archive + Archiwum + + + + Templates + Szablony + + + + Trash + Kosz + + + + + Novel Document + Dokument powieści + + + + + Project Note + Notatka projektu + + + + Root Folder + Katalog bazowy + + + + Folder + Katalog + + + + Novel Title Page + Strona tytułowa powieści + + + + Novel Chapter + Rozdział powieści + + + + Novel Scene + Scena + + + + Novel Section + Sekcja + + + + Tag + Znacznik + + + + Point of View + Punkt widzenia + + + + + Focus + Skupienie + + + + Title + Tytuł + + + + Level + Poziom + + + + Document + Dokument + + + + Line + Wiersz + + + + Chars + Znaki + + + + Words + Słowa + + + + Pars + Akapity + + + + POV + Punkt widzenia + + + + Synopsis + Streszczenie + + + + Open Document (.odt) + Open Document (.odt) + + + + Flat Open Document (.fodt) + Flat Open Document (.fodt) + + + + novelWriter HTML (.html) + novelWriter HTML (.html) + + + + novelWriter Markup (.txt) + novelWriter Markup (.txt) + + + + Standard Markdown (.md) + Standard Markdown (.md) + + + + Extended Markdown (.md) + Extended Markdown (.md) + + + + JSON + novelWriter HTML (.json) + JSON + novelWriter HTML (.json) + + + + JSON + novelWriter Markup (.json) + JSON + novelWriter Markup (.json) + + + + Square + Kwadrat + + + + Triangle + Trójkąt + + + + Nabla + Nabla + + + + Diamond + Diament + + + + Pentagon + Pentagon + + + + Hexagon + Heksagon + + + + Star + Gwiazda + + + + Pacman + Pacman + + + + 1/4 Circle + Ćwierć koła + + + + Half Circle + Pół koła + + + + 3/4 Circle + 3/4 koła + + + + Full Circle + Pełne koło + + + + 1 Bar + 1 pasek + + + + 2 Bars + 2 paski + + + + 3 Bars + 3 paski + + + + 4 Bars + 4 paski + + + + 1 Block + 1 bloczek + + + + 2 Blocks + 2 bloczki + + + + 3 Blocks + 3 bloczki + + + + 4 Blocks + 4 bloczki + + + + Text files + Pliki tekstowe + + + + Markdown files + Pliki Markdown + + + + novelWriter files + Pliki novelWriter + + + + CSV files + Pliki CSV + + + + All files + Wszystkie pliki + + + + Millimetres + Milimetry + + + + Centimetres + Centymetry + + + + Inches + Cale + + + + A4 + A4 + + + + A5 + A5 + + + + A6 + A6 + + + + US Legal + US Legal + + + + US Letter + US Letter + + + + Straight single quotation mark + Amerykański cudzysłów pojedynczy + + + + Straight double quotation mark + Amerykański cudzysłów podwójny + + + + Left single quotation mark + Cudzysłów definicyjny lewy + + + + Right single quotation mark + Cudzysłów definicyjny prawy + + + + Single low-9 quotation mark + Polski cudzysłów pojedynczy lewy + + + + Single high-reversed-9 quotation mark + Polski cudzysłów definicyjny lewy + + + + Left double quotation mark + Cudzysłów amerykański lewy + + + + Right double quotation mark + Cudzysłów apostrofowy prawy + + + + Double low-9 quotation mark + Cudzysłów apostrofowy lewy + + + + Double high-reversed-9 quotation mark + Podwójny odwrócony cudzysłów górny + + + + Double low-reversed-9 quotation mark + Podwójny odwrócony cudzysłów dolny + + + + Single left-pointing angle quotation mark + Pojedynczy cudzysłów ostrokątny lewy + + + + Single right-pointing angle quotation mark + Pojedynczy cudzysłów ostrokątny prawy + + + + Double left-pointing angle quotation mark + Podwójny cudzysłów ostrokątny lewy + + + + Double right-pointing angle quotation mark + Podwójny cudzysłów ostrokątny prawy + + + + Left corner bracket + Lewy nawias narożnikowy + + + + Right corner bracket + Prawy nawias narożnikowy + + + + Left white corner bracket + Lewy nawias narożnikowy biały + + + + Right white corner bracket + Prawy nawias narożnikowy biały + + + + GuiAbout + + + About novelWriter + O programie novelWriter + + + + This application is licenced under {0} + Ta aplikacja podlega licencji {0} + + + + Credits + Twórcy + + + + GuiBuildSettings + + + + Manuscript Build Settings + Ustawienia budowy manuskryptu + + + + Name + Nazwa + + + + Selection + Wybór + + + + Headings + Nagłówki + + + + Content + Zawartość + + + + Format + Formatowanie + + + + Output + Plik wyjściowy + + + + GuiDictionaries + + + Add Dictionaries + Dodaj słowniki + + + + Download a dictionary from one of the links, and add it below. + Pobierz słownik z jednego z linków i dodaj poniżej. + + + + Add Dictionary + Dodaj słownik + + + + Dictionary install location + Lokalizacja instalacji słownika + + + + Additional dictionaries found: {0} + Znaleziono dodatkowe słowniki: {0} + + + + Free or Libre Office extension + Rozszerzenie Free lub Libre Office + + + + Browse Files + Przeglądaj pliki + + + + Could not process dictionary file + Nie można przetworzyć pliku słownika + + + + Added: {0} [{1}B] + Dodano: {0} [{1}B] + + + + GuiDocEditFooter + + + Line: {0} ({1}) + Wiersz: {0} ({1}) + + + + Words: {0} ({1}) + Słowa: {0} ({1}) + + + + Words: {0} selected + Słowa: {0} wybranych + + + + Status + Status + + + + GuiDocEditHeader + + + Toggle Tool Bar + Przełącz pasek narzędzi + + + + Outline + Zarys + + + + Search + Szukaj + + + + Toggle Focus Mode + Przełącz tryb skupienia + + + + Close + Zamknij + + + + GuiDocEditSearch + + + Search for + Wyszukaj + + + + Replace with + Zastąp przez + + + + Search + Szukaj + + + + Case Sensitive + Wielkość znaków + + + + Whole Words Only + Tylko pełne słowa + + + + RegEx Mode + Wyrażenia regularne + + + + Loop Search + Wyszukiwanie w pętli + + + + Search Next File + Przeszukuj następny plik + + + + Preserve Case + Zachowaj wielkość liter + + + + Close Search + Zamknij wyszukiwanie + + + + Find in current document + Znajdź w bieżącym dokumencie + + + + Find and replace in current document + Znajdź i zastąp w bieżącym dokumencie + + + + GuiDocEditor + + + Opened Document: {0} + Otwarto dokument: {0} + + + + This document has been changed outside of novelWriter while it was open. Overwrite the file on disk? + Dokument został zmieniony poza programem, kiedy ten był otwarty. Czy nadpisać plik na dysku? + + + + Could not save document. + Nie można zapisać dokumentu. + + + + Saved Document: {0} + Zapisano dokument: {0} + + + + Spell checking requires the package PyEnchant. It does not appear to be installed. + Sprawdzanie pisowni wymaga pakietu PyEnchant. Wygląda na to, że nie jest on zainstalowany. + + + + Spell check complete + Sprawdzanie pisowni zakończone + + + + Document Details + Szczegóły dokumentu + + + + Created: {0} + Utworzono: {0} + + + + Updated: {0} + Zaktualizowano: {0} + + + + File Location: {0} + Lokalizacja pliku: {0} + + + + Set as Document Name + Ustaw jako nazwę dokumentu + + + + Follow Tag + Podążaj za znacznikiem + + + + Create Note for Tag + Stwórz notatkę dla znacznika + + + + Cut + Wytnij + + + + Copy + Kopiuj + + + + Paste + Wklej + + + + Select All + Zaznacz wszystko + + + + Select Word + Zaznacz słowo + + + + Select Paragraph + Zaznacz akapit + + + + Spelling Suggestion(s) + Podpowiedzi pisowni + + + + No Suggestions + Brak podpowiedzi + + + + Add Word to Dictionary + Dodaj słowo do słownika + + + + Please select some text before calling replace quotes. + Zaznacz tekst przed wywołaniem zastępowania cudzysłowów. + + + + Do you want to create a new project note for the tag '{0}'? + Czy chcesz stworzyć nową notatkę dla znacznika '{0}'? + + + + GuiDocMerge + + + Merge Documents + Połącz dokumenty + + + + Documents to Merge + Dokumenty do połączenia + + + + Drag and drop items to change the order, or uncheck to exclude. + Przeciągnij i upuść, aby zmienić kolejność, albo odznacz, żeby wykluczyć. + + + + Move merged items to Trash + Przesuń połączone pliki do kosza + + + + GuiDocSplit + + + Split Document + Podziel dokument + + + + Document Headings + Nagłówki dokumentu + + + + Select the maximum level to split into files. + Wybierz maksymalny poziom dla podziału na pliki. + + + + Split on Heading Level 1 (Partition) + Dziel na nagłówkach poziomu 1 (część) + + + + Split up to Heading Level 2 (Chapter) + Dziel do nagłówków poziomu 2 (rozdział) + + + + Split up to Heading Level 3 (Scene) + Dziel do nagłówków poziomu 3 (scena) + + + + Split up to Heading Level 4 (Section) + Dziel do nagłówków poziomu 4 (sekcja) + + + + Split into a new folder + Dziel w nowym katalogu + + + + Create document hierarchy + Utwórz hierarchię dokumentów + + + + Move split document to Trash + Przenieś podzielony dokument do kosza + + + + GuiDocToolBar + + + Markdown Bold + Pogrubienie Markdown + + + + Markdown Italic + Kursywa Markdown + + + + Markdown Strikethrough + Przekreślenie Markdown + + + + Shortcode Bold + Pogrubienie Shortcode + + + + Shortcode Italic + Kursywa Shortcode + + + + Shortcode Strikethrough + Przekreślenie Shortcode + + + + Shortcode Underline + Podkreślenie Shortcode + + + + Shortcode Highlight + Podświetlenie Shortcode + + + + Shortcode Superscript + Indeks górny Shortcode + + + + Shortcode Subscript + Indeks dolny Shortcode + + + + GuiDocViewFooter + + + Show/Hide Viewer Panel + Pokaż/Ukryj panel podglądu + + + + Comments + Komentarze + + + + Show Comments + Pokaż komentarze + + + + Synopsis + Streszczenie + + + + Show Synopsis Comments + Pokaż komentarze streszczenia + + + + GuiDocViewHeader + + + Outline + Zarys + + + + Go Backward + Zobacz poprzedni + + + + Go Forward + Zobacz następny + + + + Reload + Odśwież + + + + Close + Zamknij + + + + GuiDocViewer + + + An error occurred while generating the preview. + Podczas generowania podglądu pojawił się błąd. + + + + Copy + Kopiuj + + + + Select All + Zaznacz wszystko + + + + Select Word + Zaznacz słowo + + + + Select Paragraph + Zaznacz akapit + + + + GuiDocViewerPanel + + + Hide Inactive Tags + Ukryj nieaktywne znaczniki + + + + References + Odnośniki + + + + GuiEditLabel + + + Item Label + Etykieta elementu + + + + Label + Etykieta + + + + GuiItemDetails + + + Label + Etykieta + + + + Status + Status + + + + Class + Klasa + + + + Usage + Użycie + + + + Characters + Znaki + + + + Words + Słowa + + + + Paragraphs + Akapity + + + + GuiLipsum + + + Insert Placeholder Text + Wstaw tekst zastępczy + + + + Insert Lorem Ipsum Text + Wstaw tekst Lorem Ipsum + + + + Number of paragraphs + Liczba akapitów + + + + Randomise order + Ustaw losową kolejność + + + + Insert + Wstaw + + + + GuiMain + + + novelWriter is ready ... + novelWriter jest gotowy... + + + + You are now running novelWriter version {0}. + Uruchomiona wersja noveWriter to {0}. + + + + Please check the {0}release notes{1} for further details. + Sprawdź {0} uwagi do wydania {1}, aby uzyskać więcej szczegółów. + + + + Close the current project? + Zamknąć bieżący projekt? + + + + + Changes are saved automatically. + Zmiany są zapisywane automatycznie. + + + + Backup the current project? + Zapisać kopię zapasową projektu? + + + + The project is already open by another instance of novelWriter, and is therefore locked. Override lock and continue anyway? + Projekt jest już otwarty w innej instancji novelWriter i został zablokowany. Czy pominąć blokadę i kontynuować mimo to? + + + + 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. + Uwaga: jeśli program lub komputer wcześniej zawiesił się, blokada może zostać bezpiecznie pominięta. Mimo to pomijanie nie jest zalecane, jeśli projekt jest otwarty w innej instancji programu novelWriter. Takie postępowanie może doprowadzić do uszkodzenia projektu. + + + + The project was locked by the computer '{0}' ({1} {2}), last active on {3}. + Projekt został zablokowany na komputerze '{0}' ({1} {2}), ostatnio aktywny {3}. + + + + The project index is outdated or broken. Rebuilding index. + Indeks projektu jest nieaktualny lub uszkodzony. Odświeżanie indeksu. + + + + Import File + Importuj plik + + + + Could not read file. The file must be an existing text file. + Nie można odczytać pliku. Plik powinien być istniejącym plikiem tekstowym. + + + + Please open a document to import the text file into. + Otwórz dokument, do którego ma zostać zaimportowany plik tekstowy. + + + + Importing the file will overwrite the current content of the document. Do you want to proceed? + Zaimportowanie pliku nadpisze obecną treść dokumentu. Czy chcesz kontynuować? + + + + Indexing completed in {0} ms + Indeksowanie zakończone w ciągu {0} ms + + + + The project index has been successfully rebuilt. + Indeks projektu został z sukcesem odświeżony. + + + + Could not initialise the dialog. + Nie można uruchomić dialogu. + + + + Do you want to exit novelWriter? + Czy chcesz opuścić novelWriter? + + + + Some changes will not be applied until novelWriter has been restarted. + Niektóre zmiany nie zostaną zastosowane, dopóki novelWriter nie zostanie uruchomiony ponownie. + + + + 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}. + Nie mogę znaleźć odnośnika do znacznika '{0}'. Znacznik nie istnieje lub indeks jest nieaktualny. Indeks można zaktualizować poprzez menu Narzędzia lub wciskając {1}. + + + + GuiMainMenu + + + &Project + &Projekt + + + + Create or Open Project + Stwórz lub otwórz projekt + + + + Save Project + Zapisz projekt + + + + Close Project + Zamknij projekt + + + + Project Settings + Ustawienia projektu + + + + Novel Details + Szczegóły powieści + + + + Rename Item + Zmień nazwę elementu + + + + Delete Item + Usuń element + + + + Empty Trash + Opróżnij kosz + + + + Exit + Wyjdź + + + + &Document + &Dokument + + + + Open Document + Otwórz dokument + + + + Save Document + Zapisz dokument + + + + Close Document + Zamknij dokument + + + + View Document + Podgląd dokumentu + + + + Close Document View + Zamknij podgląd dokumentu + + + + Show File Details + Pokaż szczegóły pliku + + + + Import Text from File + Importuj tekst z pliku + + + + &Edit + &Edycja + + + + Undo + Cofnij + + + + Redo + Ponów + + + + Cut + Wytnij + + + + Copy + Kopiuj + + + + Paste + Wklej + + + + Select All + Zaznacz wszystko + + + + Select Paragraph + Zaznacz akapit + + + + &View + &Widok + + + + Go to Tree View + Idź do widoku drzewa + + + + Go to Document + Idź do dokumentu + + + + Go to Outline + Idź do zarysu + + + + Navigate Backward + Przejdź do poprzedniego + + + + Navigate Forward + Przejdź do następnego + + + + Focus Mode + Tryb skupienia + + + + Full Screen Mode + Tryb pełnoekranowy + + + + &Insert + Ws&taw + + + + Dashes + Myślniki + + + + Short Dash + Półpauza (myślnik) + + + + Long Dash + Pauza + + + + Horizontal Bar + Długa pauza + + + + Figure Dash + Kreska liczbowa + + + + Quote Marks + Znaki cudzysłowu + + + + Left Single Quote + Lewy pojedynczy cudzysłów + + + + Right Single Quote + Prawy pojedynczy cudzysłów + + + + Left Double Quote + Lewy podwójny cudzysłów + + + + Right Double Quote + Prawy podwójny cudzysłów + + + + Alternative Apostrophe + Apostrof alternatywny + + + + General Punctuation + Ogólna interpunkcja + + + + Ellipsis + Wielokropek + + + + Prime + Prim + + + + Double Prime + Bis + + + + White Spaces + Spacje + + + + Non-Breaking Space + Spacja niełamiąca + + + + Thin Space + Wąska spacja + + + + Thin Non-Breaking Space + Wąska spacja niełamiąca + + + + Other Symbols + Pozostałe symbole + + + + List Bullet + Punktor okrągły + + + + Hyphen Bullet + Punktor dywiz + + + + Flower Mark + Punktor kwiat + + + + Per Mille + Promil + + + + Degree Symbol + Stopień (symbol) + + + + Minus Sign + Znak minus + + + + Times Sign + Znak mnożenia + + + + Division Sign + Znak dzielenia + + + + Tags and References + Znaczniki i odnośniki + + + + Special Comments + Komentarze specjalne + + + + Synopsis Comment + Streszczenie + + + + Short Description Comment + Krótki opis + + + + Page Break and Space + Podział strony i spacja + + + + Page Break + Podział strony + + + + Vertical Space (Single) + Odstęp pionowy (pojedynczy) + + + + Vertical Space (Multi) + Odstęp pionowy (wielokrotny) + + + + Placeholder Text + Tekst zastępczy + + + + Footnote + Przypis + + + + &Format + &Formatowanie + + + + Bold + Pogrubienie + + + + Italic + Kursywa + + + + Strikethrough + Przekreślenie + + + + Wrap Double Quotes + Dodaj podwójny cudzysłów + + + + Wrap Single Quotes + Dodaj pojedynczy cudzysłów + + + + More Formats ... + Więcej formatów... + + + + Bold (Shortcode) + Pogrubienie (Shortcode) + + + + Italics (Shortcode) + Kursywa (Shortcode) + + + + Strikethrough (Shortcode) + Przekreślenie (Shortcode) + + + + Underline + Podkreślenie + + + + Highlight + Podświetlenie + + + + Superscript + Indeks górny + + + + Subscript + Indeks dolny + + + + Heading 1 (Partition) + Nagłówek 1 (część) + + + + Heading 2 (Chapter) + Nagłówek 2 (rozdział) + + + + Heading 3 (Scene) + Nagłówek 3 (scena) + + + + Heading 4 (Section) + Nagłówek 4 (sekcja) + + + + Novel Title + Tytuł powieści + + + + Unnumbered Chapter + Rozdział nienumerowany + + + + Alternative Scene + Scena alternatywna + + + + Align Left + Wyrównaj do lewej + + + + Align Centre + Wyrównaj do środka + + + + Align Right + Wyrównaj do prawej + + + + Indent Left + Wcięcie z lewej + + + + Indent Right + Wcięcie z prawej + + + + Toggle Comment + Przełącz komentarz + + + + Toggle Ignore Text + Przełącz tekst ignorowany + + + + Remove Block Format + Usuń formatowanie blokowe + + + + Replace Straight Single Quotes + Zastąp pojedyncze cudzysłowy proste + + + + Replace Straight Double Quotes + Zastąp podwójne cudzysłowy proste + + + + Remove In-Paragraph Breaks + Usuń podziały wewnątrz akapitu + + + + &Search + &Szukaj + + + + Find + Znajdź + + + + Replace + Zastąp + + + + Find Next + Znajdź następny + + + + Find Previous + Znajdź poprzedni + + + + Replace Next + Zastąp następny + + + + Find in Project + Znajdź w projekcie + + + + &Tools + &Narzędzia + + + + Check Spelling + Sprawdź pisownię + + + + Spell Check Language + Język sprawdzania pisowni + + + + Default + Domyślny + + + + Re-Run Spell Check + Uruchom ponownie sprawdzanie pisowni + + + + Project Word List + Lista słów dla projektu + + + + Add Dictionaries + Dodaj słowniki + + + + Rebuild Index + Odśwież indeks + + + + Backup Project + Wykonaj kopię zapasową projektu + + + + Build Manuscript + Buduj manuskrypt + + + + Writing Statistics + Statystyka pisania + + + + Preferences + Ustawienia + + + + &Help + Po&moc + + + + About novelWriter + O programie novelWriter + + + + About Qt5 + O bibliotece Qt5 + + + + User Manual (Online) + Podręcznik użytkownika (online) + + + + User Manual (PDF) + Podręcznik użytkownika (PDF) + + + + Report an Issue (GitHub) + Zgłoś błąd (GitHub) + + + + Ask a Question (GitHub) + Zadaj pytanie (GitHub) + + + + The novelWriter Website + Strona novelWriter + + + + GuiMainStatus + + + + None + Żaden + + + + Editor + Edytor + + + + Project + Projekt + + + + Session Time + Czas sesji + + + + Words: {0} ({1}) + Słowa: {0} ({1}) + + + + Project word count (session change) + Ilość słów w projekcie (zmiana w czasie sesji) + + + + Novel word count (session change) + Ilość słów w powieści (zmiana w czasie sesji) + + + + GuiManuscript + + + Build Manuscript + Buduj manuskrypt + + + + Add New Build + Dodaj nowy wzorzec + + + + Delete Selected Build + Usuń wybrany wzorzec + + + + Edit Selected Build + Edytuj wybrany wzorzec + + + + Builds + Wzorce budowy + + + + Details + Szczegóły + + + + Outline + Zarys + + + + Preview + Podgląd + + + + Print + Drukuj + + + + Build + Buduj + + + + Close + Zamknij + + + + + My Manuscript + Mój manuskrypt + + + + GuiManuscriptBuild + + + Build Manuscript + Buduj manuskrypt + + + + Output Format + Format wyjściowy + + + + Table of Contents + Spis treści + + + + Path + Ścieżka + + + + File Name + Nazwa pliku + + + + Reset file name to default + Przywróć domyślną nazwę pliku + + + + Open Folder + Otwórz katalog + + + + &Build + &Buduj + + + + Select Folder + Wybierz katalog + + + + Output folder does not exist. + Katalog docelowy nie istnieje. + + + + The file already exists. Do you want to overwrite it? + Ten plik już istnieje. Czy chcesz go nadpisać? + + + + GuiNovelDetails + + + + Novel Details + Szczegóły powieści + + + + Overview + Ogólne + + + + Contents + Zawartość + + + + GuiNovelToolBar + + + Outline of {0} + Zarys {0} + + + + Novel Root + Katalog bazowy powieści + + + + Refresh + Odśwież + + + + Last Column + Ostatnia kolumna + + + + Hidden + Ukryta + + + + Point of View Character + Punkt widzenia postaci + + + + Focus Character + Skupienie na postaci + + + + Novel Plot + Wątek powieści + + + + + Column Size + Rozmiar kolumny + + + + More Options + Więcej opcji + + + + Maximum column size in % + Maksymalny rozmiar kolumny w % + + + + GuiNovelTree + + + No meta data + Brak metadanych + + + + GuiOutlineDetails + + + + + Title + Tytuł + + + + Chapter + Rozdział + + + + Scene + Scena + + + + Section + Sekcja + + + + Document + Dokument + + + + Status + Status + + + + Characters + Znaki + + + + Words + Słowa + + + + Paragraphs + Akapity + + + + Synopsis + Streszczenie + + + + Title Details + Szczegóły tytułu + + + + Reference Tags + Odnośniki do znaczników + + + + GuiOutlineHeaderMenu + + + Select Columns + Wybierz kolumny + + + + GuiOutlineToolBar + + + Outline of + Zarys + + + + Refresh + Odśwież + + + + Export CSV + Eksport CSV + + + + GuiOutlineTree + + + Save Outline As + Zapisz zarys jako + + + + GuiPreferences + + + + Preferences + Ustawienia + + + + Search + Szukaj + + + + General + Podstawowe + + + + Appearance + Wygląd + + + + Display language + Język interfejsu + + + + + Requires restart to take effect. + Zmiana wymaga ponownego uruchomienia programu. + + + + Colour theme + Motyw kolorystyczny + + + + General colour theme and icons. + Ogólny motyw kolorystyczny oraz ikony. + + + + Application font + Czcionka interfejsu + + + + Hide vertical scroll bars in main windows + Ukryj pionowe paski przewijania w oknach głównych + + + + + Scrolling available with mouse wheel and keys only. + Przewijanie będzie możliwe tylko przy pomocy kółka myszy i klawiszy. + + + + Hide horizontal scroll bars in main windows + Ukryj poziome paski przewijania w oknach głównych + + + + Use the system's font selection dialog + Używaj systemowego dialogu wyboru czcionki + + + + Turn off to use the Qt font dialog, which may have more options. + Wyłącz, aby używać dialogu czcionek Qt, w którym może być więcej opcji. + + + + Document Style + Styl dokumentu + + + + Document colour theme + Motyw kolorystyczny dokumentu + + + + Colour theme for the editor and viewer. + Motyw kolorystyczny dla edytora i okna podglądu. + + + + Document font + Czcionka dokumentu + + + + + + Applies to both document editor and viewer. + Dotyczy zarówno edytora, jak i okna podglądu. + + + + Emphasise partition and chapter labels + Wytłuść etykiety części i rozdziałów + + + + Makes them stand out in the project tree. + Wyróżnia je w drzewie projektu. + + + + Show full path in document header + Pokaż pełną ścieżkę w pasku tytułowym dokumentu + + + + Add the parent folder names to the header. + Pokaż nazwy katalogów nadrzędnych w pasku tytułowym. + + + + Include project notes in status bar word count + Uwzględnij notatki projektu w ilości słów w pasku statusu + + + + Auto Save + Autozapis + + + + Save document interval + Częstotliwość autozapisu dokumentu + + + + How often the document is automatically saved. + Jak często dokument ma być zapisywany automatycznie. + + + + + seconds + sekundy + + + + Save project interval + Częstotliwość autozapisu projektu + + + + How often the project is automatically saved. + Jak często projekt ma być zapisywany automatycznie. + + + + Project Backup + Kopia zapasowa projektu + + + + Browse + Przeglądaj + + + + Backup storage location + Lokalizacja kopii zapasowych + + + + + Path: {0} + Ścieżka: {0} + + + + Run backup when the project is closed + Wykonuj kopię zapasową podczas zamykania projektu + + + + Can be overridden for individual projects in Project Settings. + Może zostać zmienione dla konkretnych projektów w ustawieniach projektu. + + + + Ask before running backup + Zapytaj przed stworzeniem kopii zapasowej + + + + If off, backups will run in the background. + Jeśli wyłączone, to kopie zapasowe będą tworzone w tle. + + + + Session Timer + Licznik sesji + + + + Pause the session timer when not writing + Zatrzymaj licznik sesji, gdy pisanie jest przerwane + + + + Also pauses when the application window does not have focus. + Licznik zatrzymuje się również, kiedy okno programu jest nieaktywne. + + + + Editor inactive time before pausing timer + Czas nieaktywności edytora przed zatrzymaniem licznika + + + + User activity includes typing and changing the content. + Aktywność użytkownika oznacza pisanie oraz zmianę zawartości. + + + + minutes + minuty + + + + Writing + Pisanie + + + + Text Flow + Przepływ tekstu + + + + Maximum text width in "Normal Mode" + Maksymalna szerokość tekstu w trybie normalnym + + + + Set to 0 to disable this feature. + Ustaw jako 0, żeby wyłączyć tę opcję. + + + + + + + px + px + + + + Maximum text width in "Focus Mode" + Maksymalna szerokość tekstu w trybie skupienia + + + + The maximum width cannot be disabled. + Maksymalna szerokość nie może być wyłączona. + + + + Hide document footer in "Focus Mode" + Ukryj dolny pasek dokumentu w trybie skupienia + + + + Hide the information bar in the document editor. + Ukryj pasek informacji w edytorze dokumentu. + + + + Justify the text margins + Wyjustuj marginesy tekstu + + + + Minimum text margin + Minimalny margines tekstu + + + + Tab width + Szerokość tabulatora + + + + The width of a tab key press in the editor and viewer. + Szerokość znaku tabulacji w edytorze i oknie podglądu. + + + + Text Editing + Edycja tekstu + + + + Spell check language + Język sprawdzania pisowni + + + + Available languages are determined by your system. + Dostępne języki zależą od twojego systemu. + + + + Auto-select word under cursor + Automatycznie wybieraj słowo pod kursorem + + + + Apply formatting to word under cursor if no selection is made. + Nadaj formatowanie słowu pod kursorem, jeśli nic nie zostało zaznaczone. + + + + Show tabs and spaces + Pokazuj spacje i znaki tabulacji + + + + Show line endings + Pokazuj znaki końca wiersza + + + + Editor Scrolling + Przewijanie w edytorze + + + + Scroll past end of the document + Przewijaj poza koniec dokumentu + + + + Also centres the cursor when scrolling. + Również wyśrodkowuje kursor podczas przewijania. + + + + Typewriter style scrolling when you type + Przewijanie w stylu maszyny do pisania podczas wprowadzania tekstu + + + + Keeps the cursor at a fixed vertical position. + Utrzymuje kursor w na stałej pozycji w pionie. + + + + Minimum position for Typewriter scrolling + Minimalna pozycja do przewijania w stylu maszyny do pisania + + + + Percentage of the editor height from the top. + Procentowa wysokość od góry edytora. + + + + Text Highlighting + Wyróżnianie tekstu + + + + None + Żaden + + + + Single Quotes + Pojedynczy cudzysłów + + + + Double Quotes + Podwójny cudzysłów + + + + Both + Obydwa + + + + Highlight dialogue + Wyróżniaj dialogi + + + + Applies to the selected quote styles. + Dotyczy wybranych stylów cudzysłowu. + + + + Allow open-ended dialogue + Zezwalaj na otwarty dialog + + + + Highlight dialogue line with no closing quote. + Wyróżniaj dialog bez cudzysłowu zamykającego. + + + + Dialogue narrator break symbol + Symbol wtrącenia narratora + + + + Symbol to indicate injected narrator break. + Symbol wskazujący na wtrącenie narratora. + + + + Dialogue line symbol + Symbol kwestii dialogowej + + + + Lines starting with this symbol are dialogue. + Wiersze zaczynające się od tego symbolu są dialogiem. + + + + Alternative dialogue symbols + Alternatywne symbole kwestii dialogowych + + + + Custom highlighting of dialogue text. + Niestandardowe wyróżnienie kwestii dialogowej. + + + + Add highlight colour to emphasised text + Nadaj kolor wyróżnionemu tekstowi + + + + + Applies to the document editor only. + Dotyczy tylko edytora dokumentów. + + + + Highlight multiple or trailing spaces + Wyświetlaj spacje wielokrotne lub znajdujące się na końcu linii + + + + Text Automation + Automatyzacja tekstu + + + + Auto-replace text as you type + Automatycznie zastępuj tekst podczas pisania + + + + Allow the editor to replace symbols as you type. + Pozwól, żeby edytor zastępował symbole w trakcie ich wprowadzania. + + + + Auto-replace single quotes + Automatycznie zastępuj pojedyncze cudzysłowy + + + + + Try to guess which is an opening or a closing quote. + Próbuj zgadnąć, czy cudzysłów jest otwierający czy zamykający. + + + + Auto-replace double quotes + Automatycznie zastępuj podwójne cudzysłowy + + + + Auto-replace dashes + Automatycznie zastępuj myślniki + + + + Double and triple hyphens become short and long dashes. + Podwójne i potrójne dywizy są zamieniane na półpauzy i pauzy. + + + + Auto-replace dots + Automatycznie zastępuj kropki + + + + Three consecutive dots become ellipsis. + Trzy kolejne kropki zamieniane są na wielokropek. + + + + Insert non-breaking space before + Wstawiaj spację niełamiącą przed + + + + Automatically add space before any of these symbols. + Automatycznie dodawaj spację przed jednym z tych znaków. + + + + Insert non-breaking space after + Wstawiaj spację niełamiącą po + + + + Automatically add space after any of these symbols. + Automatycznie dodawaj spację po jednym z tych znaków. + + + + Use thin space instead + Używaj wąskiej spacji + + + + Inserts a thin space instead of a regular space. + Wstawia wąską spację zamiast zwykłej. + + + + Quotation Style + Style znaków cytowania + + + + Single quote open style + Pojedynczy otwierający cudzysłów + + + + The symbol to use for a leading single quote. + Symbol używany jako początkowy znak cytowania. + + + + Single quote close style + Pojedynczy zamykający cudzysłów + + + + The symbol to use for a trailing single quote. + Symbol używany jako końcowy znak cytowania. + + + + Double quote open style + Podwójny otwierający cudzysłów + + + + The symbol to use for a leading double quote. + Symbol używany jako początkowy znak cytowania. + + + + Double quote close style + Podwójny zamykający cudzysłów + + + + The symbol to use for a trailing double quote. + Symbol używany jako końcowy znak cytowania. + + + + Backup Directory + Katalog kopii zapasowych + + + + GuiProjectSearch + + + Project Search + Przeszukiwanie projektu + + + + Case Sensitive + Wielkość znaków + + + + Whole Words Only + Tylko pełne słowa + + + + RegEx Mode + Wyrażenia regularne + + + + Search for + Wyszukaj + + + + GuiProjectSettings + + + + Project Settings + Ustawienia projektu + + + + Settings + Ustawienia + + + + Status + Status + + + + Importance + Ważność + + + + Auto-Replace + Autozastępowanie + + + + GuiProjectToolBar + + + Project Content + Zawartość projektu + + + + Quick Links + Szybkie linki + + + + Move Up + Przenieś wyżej + + + + Move Down + Przenieś niżej + + + + Add Item + Dodaj element + + + + Expand All + Maksymalizuj wszystko + + + + Collapse All + Minimalizuj wszystko + + + + Empty Trash + Opróżnij kosz + + + + More Options + Więcej opcji + + + + GuiProjectTree + + + Active + Aktywny + + + + Inactive + Nieaktywny + + + + Permanently delete {0} file(s) from Trash? + Trwale usunąć {0} plik(ów) z kosza? + + + + Did not find anywhere to add the file or folder! + Nie można znaleźć miejsca na dodanie pliku lub katalogu! + + + + Cannot add new files or folders to the Trash folder. + Nie można dodawać nowych plików ani katalogów do katalogu Kosz. + + + + New Note + Nowa notatka + + + + New Chapter + Nowy rozdział + + + + New Scene + Nowa scena + + + + New Document + Nowy dokument + + + + New Folder + Nowy katalog + + + + There is currently no Trash folder in this project. + W projekcie obecnie nie istnieje katalog Kosz. + + + + The Trash folder is already empty. + Katalog Kosz jest już pusty. + + + + Move '{0}' to Trash? + Przenieść '{0}' do kosza? + + + + Root folders can only be deleted when they are empty. + Katalogi bazowe mogą być usuwane tylko wtedy, gdy są puste. + + + + Permanently delete '{0}'? + Trwale usunąć '{0}'? + + + + Drag and drop is only allowed for single items, non-root items, or multiple items with the same parent. + Przeciąganie i upuszczanie jest dozwolone tylko dla pojedynczych obiektów, obiektów niebazowych lub wielu obiektów posiadających ten sam obiekt nadrzędny. + + + + No documents selected for merging. + Nie wybrano dokumentów do połączenia. + + + + Merged + Połączono + + + + + Could not write document content. + Nie można zapisać zawartości dokumentu. + + + + Do you want to duplicate this document? + Czy chcesz powielić ten dokument? + + + + Do you want to duplicate this item and all child items? + Czy chcesz powielić ten element i wszystkie elementy podrzędne? + + + + Could not duplicate all items. + Nie można powielić wszystkich elementów. + + + + There is nowhere to add item with name '{0}'. + Nie ma gdzie dodać elementu o nazwie '{0}'. + + + + GuiQuoteSelect + + + Select Quote Style + Wybierz styl cudzysłowu + + + + GuiSideBar + + + Project Tree View + Widok drzewa projektu + + + + Novel Tree View + Widok drzewa powieści + + + + Project Search + Przeszukiwanie projektu + + + + Novel Outline View + Widok zarysu powieści + + + + Build Manuscript + Buduj manuskrypt + + + + Novel Details + Szczegóły powieści + + + + Writing Statistics + Statystyka pisania + + + + Settings + Ustawienia + + + + GuiWelcome + + + Welcome + Witaj + + + + List + Lista + + + + New + Nowy + + + + Browse + Przeglądaj + + + + Cancel + Anuluj + + + + Create + Utwórz + + + + Open + Otwórz + + + + GuiWordList + + + + Project Word List + Lista słów dla projektu + + + + Import words from text file + Importuj słowa z pliku tekstowego + + + + Export words to text file + Eksportuj słowa do pliku tekstowego + + + + Note: The import file must be a plain text file with UTF-8 or ASCII encoding. + Uwaga: plik do importu musi być zwykłym plikiem tekstowym z kodowaniem UTF-8 lub ASCII. + + + + Import File + Importuj plik + + + + Export File + Eksportuj plik + + + + GuiWritingStats + + + Writing Statistics + Statystyka pisania + + + + Session Start + Start sesji + + + + Length + Długość + + + + Idle + Bezczynność + + + + Words + Słowa + + + + Histogram + Histogram + + + + Sum Totals + Całkowite sumy + + + + Total Time: + Czas całkowity: + + + + Idle Time: + Czas bezczynności: + + + + Filtered Time: + Czas netto: + + + + Novel Word Count: + Ilość słów w powieściach: + + + + Notes Word Count: + Ilość słów w notatkach: + + + + Total Word Count: + Całkowita ilość słów: + + + + Filters + Filtry + + + + Count novel files + Wliczaj pliki powieści + + + + Count note files + Wliczaj pliki notatek + + + + Hide zero word count + Ukryj zerową ilość słów + + + + Hide negative word count + Ukryj negatywną ilość słów + + + + Group entries by day + Grupuj pozycje według dni + + + + Show idle time + Pokazuj czas bezczynności + + + + Word count cap for the histogram + Limit ilości słów dla histogramu + + + + Save As + Zapisz jako + + + + JSON Data File (.json) + Plik JSON (.json) + + + + CSV Data File (.csv) + Plik CSV (.csv) + + + + JSON Data File + Plik JSON + + + + CSV Data File + Plik CSV + + + + Save Data As + Zapisz dane jako + + + + {0} file successfully written to: + {0} plik pomyślnie zapisany w: + + + + Failed to write {0} file. + Nie udało się zapisać pliku {0}. + + + + NWProject + + + Could not delete document file. + Nie można usunąć pliku dokumentu. + + + + Not a known project file format. + Nieznany format pliku dokumentu. + + + + Project file not found. + Plik projektu nie został znaleziony. + + + + Failed to open project. + Nie udało się otworzyć projektu. + + + + Unknown + Nieznany + + + + Project file does not appear to be a novelWriterXML file. + Plik projektu nie wygląda na plik novelWriterXML. + + + + 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}. + Nieznany lub nieobsługiwany format projektu. Projekt nie może zostać otwarty w tej wersji novelWriter. Plik został zapisany przez novelWriter w wersji {0}. + + + + Failed to parse project xml. + Nie udało się przetworzyć pliku xml projektu. + + + + 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? + Format plików projektu zostanie uaktualniony. Jeśli będziesz kontynuować, starsze wersje novelWriter nie będą już mogły otworzyć tego projektu. Czy kontynuować? + + + + 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? + Ten projekt został zapisany w nowszej wersji novelWriter, wersja {0}. To jest wersja {1}. Jeśli będziesz kontynuować, niektóre właściwości i ustawienia mogą nie zostać zachowane, ale cały projekt nie powinie ulec uszkodzeniu. Czy kontynuować otwieranie projektu? + + + + Recovered + Przywrócono + + + + Found {0} orphaned file(s) in the project. {1} file(s) were recovered. + Znaleziono {0} osierocony(ch) plik(ów). Przywrócono {1} plik(ów). + + + + Opened Project: {0} + Otwarto projekt: {0} + + + + There is no project open. + Żaden projekt nie jest otwarty. + + + + Failed to save project. + Nie udało się zapisać projektu. + + + + Saved Project: {0} + Zapisano projekt: {0} + + + + Backing up project ... + Wykonywanie kopii zapasowej projektu... + + + + Cannot backup project because no project name is set. Please set a Project Name in Project Settings. + Nie można wykonać kopii zapasowej projektu, ponieważ nie została ustawiona nazwa projektu. Proszę podać nazwę projektu w ustawieniach projektu. + + + + Could not create backup folder. + Nie można utworzyć katalogu kopii zapasowych. + + + + Created a backup of your project of size {0}B. + Utworzono kopię zapasową projektu o rozmiarze {0}B. + + + + Path: {0} + Ścieżka: {0} + + + + Could not write backup archive. + Nie można zapisać archiwum kopii zapasowej. + + + + Project backed up to '{0}' + Kopia zapasowa projektu utworzona w '{0}' + + + + + New + Nowy + + + + Note + Notatka + + + + Draft + Szkic + + + + Finished + Ukończony + + + + Minor + Poboczny + + + + Major + Ważny + + + + Main + Główny + + + + NovelSelector + + + All Novel Folders + Wszystkie katalogi powieści + + + + ProjectBuilder + + + The target folder is not empty. Please choose another folder. + Katalog docelowy nie jest pusty. Proszę wybrać inny katalog. + + + + An error occurred while trying to create the project. + Podczas tworzenia projektu wystąpił błąd. + + + + New Project + Nowy projekt + + + + Title Page + Strona tytułowa + + + + By + + + + + Summary of the chapter. + Podsumowanie rozdziału. + + + + Summary of the scene. + Podsumowanie strony. + + + + A short description. + Krótki opis. + + + + Chapter {0} + Rozdział {0} + + + + + Scene {0} + Scena {0} + + + + Main Plot + Główny wątek + + + + Protagonist + Protagonista + + + + Main Location + Główna lokacja + + + + + The target folder already exists. Please choose another folder. + Katalog docelowy już istnieje. Proszę wybrać inny katalog. + + + + Could not copy project files. + Nie można skopiować plików projektu. + + + + Failed to create a new example project. + Nie udało się stworzyć nowego przykładowego projektu. + + + + Failed to create a new example project. Could not find the necessary files. They seem to be missing from this installation. + Nie udało się stworzyć nowego przykładowego projektu. Nie można odnaleźć potrzebnych plików. Wydaje się, że nie ma ich w tej instalacji. + + + + QDialogButtonBox + + + OK + OK + + + + QGnomeTheme + + + &OK + &OK + + + + &Save + &Zapisz + + + + &Cancel + &Anuluj + + + + &Close + Za&mknij + + + + Close without Saving + Zamknij bez zapisywania + + + + QPlatformTheme + + + OK + OK + + + + Save + Zapisz + + + + Save All + Zapisz wszystko + + + + Open + Otwórz + + + + &Yes + &Tak + + + + Yes to &All + Tak na &wszystko + + + + &No + &Nie + + + + N&o to All + N&ie na wszystko + + + + Abort + Przerwij + + + + Retry + Spróbuj ponownie + + + + Ignore + Zignoruj + + + + Close + Zamknij + + + + Cancel + Anuluj + + + + Discard + Odrzuć + + + + Help + Pomoc + + + + Apply + Zastosuj + + + + Reset + Resetuj + + + + Restore Defaults + Przywróć domyślne + + + + SharedData + + + novelWriter Project File or Zip File + Plik projektu novelWriter lub zip + + + + novelWriter Project File + Plik projektu novelWriter + + + + Open Project + Otwórz projekt + + + + Select Font + Wybierz czcionkę + + + + VersionInfoWidget + + + Latest Version: {0} + Najnowsza wersja: {0} + + + + Checking ... + Sprawdzanie... + + + + Download from {0} + Pobierz z {0} + + + + Version + Wersja + + + + Released on + Opublikowana + + + + Release Notes + Uwagi do wydania + + + + Check Now + Sprawdź teraz + + + + Failed + Sprawdzanie nie powiodło się + + + + _ContentsPage + + + Table of Contents + Spis treści + + + + Title + Tytuł + + + + Words + Słowa + + + + Pages + Strony + + + + Page + Strona + + + + Progress + Stopień zaawansowania + + + + Words per page + Słowa na stronę + + + + First page offset + Przesunięcie pierwszej strony + + + + Chapters on odd pages + Rozdziały na stronach nieparzystych + + + + Untitled + Bez tytułu + + + + END + KONIEC + + + + _DetailsWidget + + + Setting + Ustawienie + + + + Value + Wartość + + + + Name + Nazwa + + + + Selection + Wybór + + + + Title + Tytuł + + + + Hidden + Ukryte + + + + _FilterTab + + + Included in manuscript + Uwzględnione w manuskrypcie + + + + Excluded from manuscript + Wyłączone z manuskryptu + + + + Always included + Zawsze uwzględniane + + + + Always excluded + Zawsze wyłączane + + + + Reset to default + Przywróć ustawienia domyślne + + + + Mark selection as + Zaznacz wybrane jako + + + + Select Root Folders + Wybierz katalogi bazowe + + + + _GuiAlert + + + Information + Informacja + + + + Warning + Ostrzeżenie + + + + Error + Błąd + + + + Question + Pytanie + + + + _HeadingsTab + + + Hide + Ukryj + + + + + Editing: {0} + Edytowanie: {0} + + + + + None + Nic + + + + Title + Tytuł + + + + Chapter Number + Numer rozdziału + + + + Chapter Number (Word) + Numer rozdziału (słownie) + + + + Chapter Number (Upper Case Roman) + Numer rozdziału (liczba rzymska duża) + + + + Chapter Number (Lower Case Roman) + Numer rozdziału (liczba rzymska mała) + + + + Scene Number (In Chapter) + Numer sceny (w rozdziale) + + + + Scene Number (Absolute) + Numer sceny (ciągły) + + + + Point of View Character + Punkt widzenia postaci + + + + Focus Character + Skupienie na postaci + + + + Insert + Wstaw + + + + Apply + Zastosuj + + + + Additional Styling + Dodatkowy styl + + + + + + Centre + Wyśrodkuj + + + + + + Page Break + Podział strony + + + + _NewProjectForm + + + Required + Wymagane + + + + Optional + Opcjonalnie + + + + Create a fresh project + Stwórz świeży projekt + + + + Create an example project + Stwórz przykładowy projekt + + + + Copy an existing project + Kopiuj istniejący projekt + + + + Project Name + Nazwa projektu + + + + Author + Autor + + + + Project Path + Ścieżka do projektu + + + + Prefill Project + Wypełnij projekt + + + + Set to 0 to only add scenes + Ustaw 0 aby dodać tylko sceny + + + + Add {0} chapter documents + Dodaj {0} dokumentów rozdziałów + + + + Add {0} scene documents (to each chapter) + Dodaj {0} dokumentów scen (do każdego rozdziału) + + + + Add a folder for plot notes + Dodaj katalog na notatki fabuły + + + + Add a folder for character notes + Dodaj katalog na notatki postaci + + + + Add a folder for location notes + Dodaj katalog na notatki lokacji + + + + Add example notes to the above + Dodaj przykładowe notatki do wszystkich powyższych + + + + Chapters and Scenes + Rozdziały i sceny + + + + Project Notes + Notatki projektu + + + + Create New Project + Utwórz nowy projekt + + + + Select Project Folder + Wybierz katalog projektu + + + + Fresh Project + Świeży projekt + + + + Example Project + Przykładowy projekt + + + + Template: {0} + Szablon: {0} + + + + _NewProjectPage + + + A project name is required. + Wymagana jest nazwa dla projektu. + + + + _OpenProjectPage + + + The project path is not reachable. + Ta ścieżka projektu jest niedostępna. + + + + Path + Ścieżka + + + + Remove '{0}' from the recent projects list? The project files will not be deleted. + Usunąć '{0}' z listy ostatnio używanych projektów? Pliki projektu nie zostaną usunięte. + + + + Open Project + Otwórz projekt + + + + Remove Project + Usuń projekt + + + + _OverviewPage + + + Project + Projekt + + + + + Name + Nazwa + + + + Revisions + Korekty + + + + Editing Time + Czas edycji + + + + + Word Count + Ilość słów + + + + In Novels + W powieściach + + + + In Notes + W notatkach + + + + Selected Novel + Wybrana powieść + + + + Chapters + Rozdziały + + + + Scenes + Sceny + + + + _PreviewWidget + + + Press the "Preview" button to generate ... + Naciśnij przycisk "Podgląd", aby wygenerować... + + + + Processing ... + Przetwarzanie... + + + + Done + Wykonano + + + + Built + Zbudowano + + + + No Preview + Brak podglądu + + + + _ProjectListModel + + + Word Count + Ilość słów + + + + Last Opened + Ostatnio otwarty + + + + _ReplacePage + + + Text Auto-Replace for Preview and Build + Autozastępowanie tekstu dla podglądu i budowy + + + + Keyword + Słowo kluczowe + + + + Replace With + Zastąp przez + + + + Select item to edit + Wybierz element do edycji + + + + Apply + Zastosuj + + + + _SettingsPage + + + Project name + Nazwa projektu + + + + Changing this will affect the backup path. + Ta zmiana będzie miała wpływ na ścieżkę do kopii zapasowej. + + + + Author(s) + Autor(zy) + + + + + Only used when building the manuscript. + Używane jedynie podczas budowy manuskryptu. + + + + Project language + Język projektu + + + + Default + Domyślne + + + + Spell check language + Język sprawdzania pisowni + + + + + Overrides main preferences. + Zmienia ustawienia ogólne. + + + + Disable backup on close + Wyłącz tworzenie kopii zapasowej przy zamykaniu + + + + _StatsWidget + + + + Words + Słowa + + + + + Characters + Znaki + + + + Words in Headings + Słowa w nagłówkach + + + + Words in Text + Słowa w tekście + + + + Headings + Nagłówki + + + + Paragraphs + Akapity + + + + Characters in Headings + Znaki w nagłówkach + + + + Characters in Text + Znaki w tekście + + + + Characters, No Spaces + Znaki bez spacji + + + + Characters in Headings, No Spaces + Znaki w nagłówkach bez spacji + + + + Characters in Text, No Spaces + Znaki w tekście bez spacji + + + + _StatusPage + + + Novel Document Status Levels + Poziomy statusów dokumentów powieści + + + + Project Note Importance Levels + Poziomy ważności notatek projektu + + + + Not in use + Nieużywany + + + + Used once + Użyty raz + + + + Used by {0} items + Używany przez {0} elementów + + + + Select Colour + Wybierz kolor + + + + Label + Etykieta + + + + Usage + Użycie + + + + Select item to edit + Wybierz element do edycji + + + + Colour + Kolor + + + + Circles ... + Kółka ... + + + + Bars ... + Paski ... + + + + Blocks ... + Bloki ... + + + + Shape + Kształt + + + + Apply + Zastosuj + + + + New Item + Nowy element + + + + Cannot delete a status item that is in use. + Nie można usunąć elementu, który jest używany. + + + + _TreeContextMenu + + + Empty Trash + Opróżnij kosz + + + + Rename + Zmień nazwę + + + + Open Document + Otwórz dokument + + + + View Document + Podgląd dokumentu + + + + Create New ... + Utwórz nowy... + + + + Rename to Heading + Zmień na nazwę nagłówka + + + + Set Active to ... + Ustaw aktywność jako... + + + + Toggle Active + Przełącz aktywność + + + + Set Status to ... + Ustaw status jako... + + + + + Manage Labels ... + Zarządzaj etykietami... + + + + Set Importance to ... + Ustaw ważność jako... + + + + Transform ... + Przekształć... + + + + + + + Convert to {0} + Zmień na {0} + + + + Merge Child Items into Self + Połącz elementy podrzędne razem + + + + Merge Child Items into New + Połącz elementy podrzędne jako nowy dokument + + + + Merge Documents in Folder + Połącz dokumenty w katalogu + + + + Split Document by Headings + Podziel dokument według nagłówków + + + + Expand All + Maksymalizuj wszystko + + + + Collapse All + Minimalizuj wszystko + + + + Duplicate + Powiel + + + + + Delete Permanently + Usuń trwale + + + + + Move to Trash + Przenieś do kosza + + + + Move {0} items to Trash? + Przesunąć {0} elementów do kosza? + + + + Do you want to convert the folder to a {0}? This action cannot be reversed. + Czy chcesz przekształcić katalog na {0}? Tego działania nie można cofnąć. + + + + _UpdatableMenu + + + From Template + Z szablonu + + + + _ViewPanelBackRefs + + + Document + Dokument + + + + First Heading + Pierwszy nagłówek + + + + _ViewPanelKeyWords + + + Tag + Znacznik + + + + Importance + Ważność + + + + Document + Dokument + + + + Heading + Nagłówek + + + + Short Description + Krótki opis + + + diff --git a/i18n/nw_pt_BR.ts b/i18n/nw_pt_BR.ts index e19e5b5b..ae8c69b6 100644 --- a/i18n/nw_pt_BR.ts +++ b/i18n/nw_pt_BR.ts @@ -106,7 +106,7 @@ Text Font - + Fonte do texto @@ -141,7 +141,7 @@ Apply Dialogue Highlighting - + Aplicar destaque de diálogo @@ -151,17 +151,17 @@ Enable Indent - + Habilitar recuo Indent Width - + Largura do recuo Indent First Paragraph - + Recuar primeiro parágrafo @@ -535,102 +535,102 @@ Square - + Quadrado Triangle - + Triângulo Nabla - + Nabla Diamond - + Diamante Pentagon - + Pentágono Hexagon - + Hexágono Star - + Estrela Pacman - + Pacman 1/4 Circle - + 1/4 de círculo Half Circle - + Meio círculo 3/4 Circle - + 3/4 de círculo Full Circle - + Círculo completo 1 Bar - + 1 barra 2 Bars - + 2 barras 3 Bars - + 3 barras 4 Bars - + 4 barras 1 Block - + 1 bloco 2 Blocks - + 2 blocos 3 Blocks - + 3 blocos 4 Blocks - + 4 blocos @@ -803,7 +803,7 @@ This application is licenced under {0} - Esta aplicação está licenciada sob {0} + Este programa está licenciado sob {0} @@ -1267,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel Exibir/ocultar painel de visualização - + Comments Comentários - + Show Comments Exibir comentários - + Synopsis Sinopse - + Show Synopsis Comments Exibir comentários de sinopse @@ -1534,12 +1534,12 @@ Deseja sair do novelWriter? - + Some changes will not be applied until novelWriter has been restarted. Algumas alterações não serão aplicadas enquanto o novelWriter não for reiniciado. - + 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}. Não foi possível encontrar a referência para a etiqueta '{0}'. Pode ser que ela não exista ou que o índice esteja desatualizado. O índice pode ser atualizado a partir do menu Ferramentas ou pressionando {1}. @@ -1684,12 +1684,12 @@ Go to Tree View - + Ir para visualização em árvore Go to Document - + Ir para o documento @@ -1909,7 +1909,7 @@ Footnote - + Notas de rodapé @@ -2457,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title Título - + Chapter Capítulo - + Scene Cena - + Section Seção - + Document Documento - + Status Estado - + Characters Caracteres - + Words Palavras - + Paragraphs Parágrafos - + Synopsis Sinopse - + Title Details Detalhes do título - + Reference Tags Etiquetas de referência @@ -2522,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns Selecionar colunas @@ -2548,7 +2548,7 @@ GuiOutlineTree - + Save Outline As Salvar estrutura como @@ -2556,589 +2556,589 @@ GuiPreferences - - + + Preferences Preferências - + Search Pesquisa - + General Geral - + Appearance Aparência - + Display language Idioma - - + + Requires restart to take effect. É necessário reiniciar para ter efeito. - + Colour theme Tema do programa - + General colour theme and icons. Tema de cores e ícones gerais. - + Application font - + Fonte do programa - + Hide vertical scroll bars in main windows Ocultar a barra de rolagem vertical nas janelas principais - - + + Scrolling available with mouse wheel and keys only. Rolagem disponível apenas com a roda do mouse ou teclado. - + Hide horizontal scroll bars in main windows Ocultar a barra de rolagem horizontal nas janelas principais - + Use the system's font selection dialog - + Usar o diálogo de seleção de fonte do sistema - + Turn off to use the Qt font dialog, which may have more options. - + Desligue para usar o diálogo de fonte do Qt, que pode ter mais opções. - + Document Style Estilo do documento - + Document colour theme Tema de cores do documento - + Colour theme for the editor and viewer. Tema de cores do editor e da visualização. - + Document font - + Fonte do documento - - - + + + Applies to both document editor and viewer. - Aplica-se ao editor à visualização de documentos. + Aplica-se ao editor e à visualização de documentos. - + Emphasise partition and chapter labels Destacar rótulos de partes e capítulos - + Makes them stand out in the project tree. Faz com que eles se destaquem na árvore do projeto. - + Show full path in document header Mostrar caminho completo no cabeçalho - + Add the parent folder names to the header. Inclui o nome dos diretórios superiores no cabeçalho do documento. - + Include project notes in status bar word count Incluir as notas do projeto na contagem de palavras - + Auto Save Salvamento automático - + Save document interval Intervalo de salvamento do documento - + How often the document is automatically saved. Com qual frequência o documento é salvo automaticamente. - - + + seconds segundos - + Save project interval Intervalo de salvamento do projeto - + How often the project is automatically saved. Com qual frequência o projeto é salvo automaticamente. - + Project Backup Cópia de segurança - + Browse Explorar - + Backup storage location Local da cópia de segurança - - + + Path: {0} Caminho: {0} - + Run backup when the project is closed Criar cópia de segurança quando o projeto é fechado - + Can be overridden for individual projects in Project Settings. Pode ser sobrescrito por projeto individual nas configurações do projeto. - + Ask before running backup Perguntar antes de criar cópia de segurança - + If off, backups will run in the background. Se desativado, cópias de segurança serão criadas em segundo plano. - + Session Timer Temporizador de sessão - + Pause the session timer when not writing Pausar o temporizador de sessão quando não estiver escrevendo - + Also pauses when the application window does not have focus. Também pausa quando a janela do programa não estiver em foco. - + Editor inactive time before pausing timer Tempo de inatividade do editor antes de pausar o temporizador - + User activity includes typing and changing the content. Atividades de usuário incluem digitar e modificar o conteúdo. - + minutes minutos - + Writing Escrita - + Text Flow Fluxo do texto - + Maximum text width in "Normal Mode" Largura máxima do texto no "Modo Normal" - + Set to 0 to disable this feature. Use 0 para desativar esta função. - - - - + + + + px px - + Maximum text width in "Focus Mode" Largura máxima do texto no "Modo Foco" - + The maximum width cannot be disabled. A largura máxima não pode ser desativada. - + Hide document footer in "Focus Mode" Ocultar o rodapé do documento no "Modo Foco" - + Hide the information bar in the document editor. Ocultar a barra de informações do editor de documentos. - + Justify the text margins Justificar as margens do texto - + Minimum text margin Margem de texto mínima - + Tab width Largura da tabulação - + The width of a tab key press in the editor and viewer. Largura da tabulação no editor e visualizador. - + Text Editing Edição de texto - + Spell check language Idioma da verificação ortográfica - + Available languages are determined by your system. Os idiomas disponíveis são determinados pelo seu sistema. - + Auto-select word under cursor Selecionar automaticamente a palavra sob o cursor - + Apply formatting to word under cursor if no selection is made. Aplicar a formatação à palavra sob o cursor se nenhuma seleção for feita. - + Show tabs and spaces Mostrar tabulações e espaços - + Show line endings Mostrar terminações de linha - + Editor Scrolling Rolagem do editor - + Scroll past end of the document Rolar após o final do documento - + Also centres the cursor when scrolling. Também centraliza o cursor ao rolar. - + Typewriter style scrolling when you type Rolagem no estilo de máquina de escrever ao digitar - + Keeps the cursor at a fixed vertical position. Mantém o cursor em uma posição vertical fixa. - + Minimum position for Typewriter scrolling Posição mínima para a rolagem de máquina de escrever - + Percentage of the editor height from the top. Porcentagem da altura do editor desde o topo. - + Text Highlighting Destaque de texto - + None - Nenhum + Nenhum + + + + Single Quotes + Aspas simples + + + + Double Quotes + Aspas duplas - Single Quotes - - - - - Double Quotes - - - - Both - + Ambos - + Highlight dialogue - + Destacar diálogo - + Applies to the selected quote styles. - + Aplica-se aos estilos de aspas selecionados. - + Allow open-ended dialogue - + Permitir diálogo sem aspas de fechamento - + Highlight dialogue line with no closing quote. - + Destacar a linha de diálogo sem aspas de fechamento. - + Dialogue narrator break symbol - + Símbolo de quebra de diálogo pelo narrador - + Symbol to indicate injected narrator break. - + Símbolo para indicar uma quebra com aparte do narrador. - + Dialogue line symbol - + Símbolo de linha de diálogo - + Lines starting with this symbol are dialogue. - + Linhas que começam com este símbolo são diálogo. - + Alternative dialogue symbols - + Símbolos de diálogos alternativos - + Custom highlighting of dialogue text. - + Destaque personalizado do texto do diálogo. - + Add highlight colour to emphasised text Adicionar cor de destaque ao texto enfatizado - - + + Applies to the document editor only. - Aplica-se apenas para o editor de documentos. + Aplica-se apenas ao editor de documentos. - + Highlight multiple or trailing spaces Destacar espaços múltiplos ou finais - + Text Automation Substituição ao digitar - + Auto-replace text as you type Substituir automaticamente o texto ao digitar - + Allow the editor to replace symbols as you type. Permite que o editor substitua símbolos conforme você digita. - + Auto-replace single quotes Substituir aspas simples automaticamente - - + + Try to guess which is an opening or a closing quote. Tenta adivinhar se a aspa é de abertura ou de fechamento. - + Auto-replace double quotes Substituir aspas duplas automaticamente - + Auto-replace dashes Substituir travessões automaticamente - + Double and triple hyphens become short and long dashes. Hífens duplos ou triplos são substituídos por travessões curtos (en dash) ou longos (em dash). - + Auto-replace dots Substituir pontos automaticamente - + Three consecutive dots become ellipsis. Três pontos consecutivos são substituídos por reticências. - + Insert non-breaking space before Inserir espaço não-separável antes de - + Automatically add space before any of these symbols. Adiciona automaticamente um espaço não-separável antes de cada um desses símbolos. - + Insert non-breaking space after Inserir espaço não-separável após - + Automatically add space after any of these symbols. Adiciona automaticamente um espaço não-separável após cada um desses símbolos. - + Use thin space instead Usar espaço estreito - + Inserts a thin space instead of a regular space. Insere um espaço estreito em vez de um espaço regular. - + Quotation Style Estilo de aspas - + Single quote open style Estilo da aspa de abertura simples - + The symbol to use for a leading single quote. Símbolo usado para a aspa simples à esquerda. - + Single quote close style Estilo da aspa de fechamento simples - + The symbol to use for a trailing single quote. Símbolo usado para a aspa simples à direita. - + Double quote open style Estilo da aspa de abertura dupla - + The symbol to use for a leading double quote. Símbolo usado para a aspa dupla à esquerda. - + Double quote close style Estilo da aspa de fechamento dupla - + The symbol to use for a trailing double quote. Símbolo usado para a aspa dupla à direita. - + Backup Directory Diretório da cópia de segurança @@ -3372,7 +3372,7 @@ Select Quote Style - + Selecionar o estilo da citação @@ -4039,7 +4039,7 @@ Select Font - + Selecionar fonte @@ -4565,7 +4565,7 @@ No Preview - + Sem pré-visualização @@ -4606,7 +4606,7 @@ Apply - Aplicar + Aplicar @@ -4774,27 +4774,27 @@ Circles ... - + Círculos ... Bars ... - + Barras ... Blocks ... - + Blocos ... Shape - + Forma Apply - Aplicar + Aplicar diff --git a/i18n/nw_zh_CN.ts b/i18n/nw_zh_CN.ts index 966a62b4..6ed81f95 100644 --- a/i18n/nw_zh_CN.ts +++ b/i18n/nw_zh_CN.ts @@ -106,7 +106,7 @@ Text Font - + 文字字体 @@ -141,7 +141,7 @@ Apply Dialogue Highlighting - + 应用对话高亮 @@ -151,17 +151,17 @@ Enable Indent - + 启用缩进 Indent Width - + 缩进宽度 Indent First Paragraph - + 缩进第一段 @@ -535,102 +535,102 @@ Square - + 方块 Triangle - + 三角形 Nabla - + 倒三角形 Diamond - + 菱形 Pentagon - + 五边形 Hexagon - + 六边形 Star - + 星形 Pacman - + 吃豆人形 1/4 Circle - + 1/4 圆 Half Circle - + 半圆 3/4 Circle - + 3/4 圈 Full Circle - + 圆形 1 Bar - + 1 条 2 Bars - + 2 条 3 Bars - + 3 条 4 Bars - + 4 条 1 Block - + 1 块 2 Blocks - + 2 块 3 Blocks - + 3 块 4 Blocks - + 4 块 @@ -1267,27 +1267,27 @@ GuiDocViewFooter - + Show/Hide Viewer Panel 显示/隐藏查看器面板 - + Comments 注释 - + Show Comments 显示评论 - + Synopsis 概要 - + Show Synopsis Comments 显示概要注释 @@ -1534,12 +1534,12 @@ 您是否想退出novelWriter？ - + Some changes will not be applied until novelWriter has been restarted. 某些改动在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}. 无法找到标签 {0} 的引用. 因为不存在或者索引已经过期。索引可在工具菜单或按 {1} 进行更新。 @@ -1684,12 +1684,12 @@ Go to Tree View - + 转到树形视图 Go to Document - + 转到文档 @@ -1909,7 +1909,7 @@ Footnote - + 脚注 @@ -2457,64 +2457,64 @@ GuiOutlineDetails - - - + + + Title 标题 - + Chapter 章节 - + Scene 场景 - + Section 小结 - + Document 文档 - + Status 状态 - + Characters 人物 - + Words 单词 - + Paragraphs 段落 - + Synopsis 概要 - + Title Details 标题详情 - + Reference Tags 引用标签 @@ -2522,7 +2522,7 @@ GuiOutlineHeaderMenu - + Select Columns 选定列 @@ -2548,7 +2548,7 @@ GuiOutlineTree - + Save Outline As 大纲另存为 @@ -2556,589 +2556,589 @@ GuiPreferences - - + + Preferences 设置 - + Search 搜索 - + General 通用 - + Appearance 外观配置 - + Display language 显示语言 - - + + Requires restart to take effect. 需要重新启动才能生效。 - + Colour theme 颜色主题 - + General colour theme and icons. 通用颜色主题和图标。 - + Application font - + 应用程序字体 - + Hide vertical scroll bars in main windows 在主窗口中隐藏垂直滚动条 - - + + Scrolling available with mouse wheel and keys only. 仅可使用鼠标滚轮和按键进行滚动。 - + Hide horizontal scroll bars in main windows 在主窗口中隐藏水平滚动条 - + Use the system's font selection dialog - + 使用系统字体选择对话框 - + Turn off to use the Qt font dialog, which may have more options. - + 关闭以使用 Qt 字体对话框，因为它可能有更多选项。 - + Document Style 文档样式 - + Document colour theme 文档颜色主题 - + Colour theme for the editor and viewer. 应用于编辑器和查看器的颜色主题。 - + Document font - + 文档字体 - - - + + + Applies to both document editor and viewer. 同时应用于文档编辑器和查看器。 - + Emphasise partition and chapter labels 强调分区和章节标签 - + Makes them stand out in the project tree. 在项目树中突出它们 - + Show full path in document header 在文档标题中显示完整路径 - + Add the parent folder names to the header. 将父文件夹名称添加到标题中。 - + Include project notes in status bar word count 在状态栏单词计数中包含项目note - + Auto Save 自动保存 - + Save document interval 保存文档间隔 - + How often the document is automatically saved. 自动保存打开的文档的频率。 - - + + seconds 秒 - + Save project interval 保存项目间隔 - + How often the project is automatically saved. 自动保存打开的项目的频率。 - + Project Backup 项目备份 - + Browse 浏览 - + Backup storage location 备份存储位置 - - + + Path: {0} 路径: {0} - + Run backup when the project is closed 项目关闭时进行备份 - + Can be overridden for individual projects in Project Settings. 可以在项目设置中为单个项目重载。 - + Ask before running backup 进行备份前询问 - + If off, backups will run in the background. 如果关闭，备份将在后台运行。 - + Session Timer 会话计时器 - + Pause the session timer when not writing 不写入时暂停会话计时器 - + Also pauses when the application window does not have focus. 当应用程序窗口没有焦点时也会暂停。 - + Editor inactive time before pausing timer 暂停计时器前的编辑器非活动时间 - + User activity includes typing and changing the content. 用户活动包括键入和更改内容。 - + minutes 分钟 - + Writing 写作 - + Text Flow 文本流 - + Maximum text width in "Normal Mode" “正常模式”下的最大文本长度 - + Set to 0 to disable this feature. 设置为 0 以禁用此功能。 - - - - + + + + px 像素 - + Maximum text width in "Focus Mode" “聚焦模式”下的最大文本长度 - + The maximum width cannot be disabled. 不能禁用最大宽度。 - + Hide document footer in "Focus Mode" 在“聚焦模式”中隐藏文档页脚" - + Hide the information bar in the document editor. 在文档编辑器中隐藏信息栏。 - + Justify the text margins 对齐文本边距 - + Minimum text margin 最小文本边距 - + Tab width 制表符宽度 - + The width of a tab key press in the editor and viewer. 编辑器和查看器中 制表符的宽度。 - + Text Editing 文本编辑 - + Spell check language 拼写检查语言 - + Available languages are determined by your system. 可用的语言由您的系统决定。 - + Auto-select word under cursor 自动选择光标下的单词 - + Apply formatting to word under cursor if no selection is made. 如果未进行选择，则将格式应用于光标下的单词。 - + Show tabs and spaces 显示制表符和空格 - + Show line endings 显示行尾 - + Editor Scrolling 编辑器滚动 - + Scroll past end of the document 滚动到文档末尾 - + Also centres the cursor when scrolling. 滚动时光标居中 - + Typewriter style scrolling when you type 打字时打字机样式滚动 - + Keeps the cursor at a fixed vertical position. 将光标保持在一个固定的垂直位置。 - + Minimum position for Typewriter scrolling 打字机滚动的最小位置 - + Percentage of the editor height from the top. 从顶部到编辑器高度的百分比。 - + Text Highlighting 文本高亮 - + None - 无 + 无 + + + + Single Quotes + 单引号 + + + + Double Quotes + 双引号 - Single Quotes - - - - - Double Quotes - - - - Both - + 两者 - + Highlight dialogue - + 突出对话内容 - + Applies to the selected quote styles. - + 应用于选定的引号样式。 - + Allow open-ended dialogue - + 允许开放对话 - + Highlight dialogue line with no closing quote. - + 突出显示没有结束引号的对话行。 - + Dialogue narrator break symbol - + 对话旁白符号 - + Symbol to indicate injected narrator break. - + 表示插入旁白的符号 - + Dialogue line symbol - + 对话行符号 - + Lines starting with this symbol are dialogue. - + 以此符号开头的行是对话。 - + Alternative dialogue symbols - + 替代对话符号 - + Custom highlighting of dialogue text. - + 自定义对话文本高亮。 - + Add highlight colour to emphasised text 为强调的文本添加高亮颜色 - - + + Applies to the document editor only. 仅应用于文档编辑器。 - + Highlight multiple or trailing spaces 突显重复和结尾的空格 - + Text Automation 文本自动化 - + Auto-replace text as you type 键入时自动替换文本 - + Allow the editor to replace symbols as you type. 允许编辑器在您键入时替换符号。 - + Auto-replace single quotes 自动替换单引号 - - + + Try to guess which is an opening or a closing quote. 尝试猜测哪个是开头或结尾的引号。 - + Auto-replace double quotes 自动替换双引号 - + Auto-replace dashes 自动替换破折号 - + Double and triple hyphens become short and long dashes. 双连字符和三连字符变成短划线和长破折号。 - + Auto-replace dots 自动替换点 - + Three consecutive dots become ellipsis. 三个连续的点变成省略号。 - + Insert non-breaking space before 在之前插入不间断的空格 - + Automatically add space before any of these symbols. 在任何这些符号之前自动添加空格。 - + Insert non-breaking space after 在后面插入不间断的空格 - + Automatically add space after any of these symbols. 在任何这些符号后自动添加空格。 - + Use thin space instead 改用细空格 - + Inserts a thin space instead of a regular space. 插入细空格而不是常规空格。 - + Quotation Style 引述样式 - + Single quote open style 单引号打开样式 - + The symbol to use for a leading single quote. 用于前导单引号的符号。 - + Single quote close style 单引号闭合样式 - + The symbol to use for a trailing single quote. 用于尾随单引号的符号。 - + Double quote open style 双引号打开样式 - + The symbol to use for a leading double quote. 用于前导双引号的符号。 - + Double quote close style 双引号闭合样式 - + The symbol to use for a trailing double quote. 用于尾随双引号的符号。 - + Backup Directory 备份目录 @@ -3372,7 +3372,7 @@ Select Quote Style - + 选择引号样式 @@ -4039,7 +4039,7 @@ Select Font - + 选择字体 @@ -4565,7 +4565,7 @@ No Preview - + 无预览 @@ -4606,7 +4606,7 @@ Apply - 应用 + 应用 @@ -4774,27 +4774,27 @@ Circles ... - + 圆 ... Bars ... - + 条 ... Blocks ... - + 块 ... Shape - + 形状 Apply - 应用 + 应用 diff --git a/novelwriter/assets/i18n/project_pl_PL.json b/novelwriter/assets/i18n/project_pl_PL.json new file mode 100644 index 00000000..a5c86b1b --- /dev/null +++ b/novelwriter/assets/i18n/project_pl_PL.json @@ -0,0 +1,116 @@ +{ + "Synopsis": "Streszczenie", + "Short Description": "Krótki opis", + "Comment": "Komentarz", + "Notes": "Notatki", + "Tag": "Znacznik", + "Point of View": "Punkt widzenia", + "Focus": "Skupienie", + "Characters": "Postacie", + "Plot": "Fabuła", + "Timeline": "Oś czasu", + "Locations": "Miejsca", + "Objects": "Obiekty", + "Entities": "Podmioty", + "Custom": "Różne", + "0": "zero", + "1": "pierwszy", + "2": "drugi", + "3": "trzeci", + "4": "czwarty", + "5": "piąty", + "6": "szósty", + "7": "siódmy", + "8": "ósmy", + "9": "dziewiąty", + "10": "dziesiąty", + "11": "jedenasty", + "12": "dwunasty", + "13": "trzynasty", + "14": "czternasty", + "15": "piętnasty", + "16": "szesnasty", + "17": "siedemnasty", + "18": "osiemnasty", + "19": "dziewiętnasty", + "20": "dwudziesty", + "21": "dwudziesty pierwszy", + "22": "dwudziesty drugi", + "23": "dwudziesty Trzeci", + "24": "dwudziesty czwarty", + "25": "dwudziesty piąty", + "26": "dwudziesty szósty", + "27": "dwudziesty siódmy", + "28": "dwudziesty ósmy", + "29": "dwudziesty dziewiąty", + "30": "trzydziesty", + "31": "trzydziesty pierwszy", + "32": "trzydziesty drugi", + "33": "trzydziesty trzeci", + "34": "trzydziesty czwarty", + "35": "trzydziesty piąty", + "36": "trzydziesty szósty", + "37": "trzydziesty siódmy", + "38": "trzydziesty ósmy", + "39": "trzydziesty dziewiaty", + "40": "czterdziesty", + "41": "czterdziesty pierwszy", + "42": "czterdziesty drugi", + "43": "czterdziesty Trzeci", + "44": "czterdziesty czwarty", + "45": "czterdziesty piąty", + "46": "czterdziesty szósty", + "47": "czterdziesty siódmy", + "48": "czterdziesty ósmy", + "49": "czterdziesty dziewiąty", + "50": "pięćdziesiąty", + "51": "pięćdziesiąty pierwszy", + "52": "pięćdziesiąty drugi", + "53": "pięćdziesiąty trzeci", + "54": "pięćdziesiąty czwarty", + "55": "pięćdziesiąty piąty", + "56": "pięćdziesiąty szósty", + "57": "pięćdziesiąty siódmy", + "58": "pięćdziesiąty ósmy", + "59": "pięćdziesiąty dziewiąty", + "60": "sześćdziesiąty", + "61": "sześćdziesiąty pierwszy", + "62": "sześćdziesiąty drugi", + "63": "sześćdziesiąty trzeci", + "64": "sześćdziesiąty czwarty", + "65": "sześćdziesiąty piąty", + "66": "sześćdziesiąty szósty", + "67": "sześćdziesiąty siódmy", + "68": "sześćdziesiąty ósmy", + "69": "sześćdziesiąty dziewiąty", + "70": "siedemdziesiąty", + "71": "siedemdziesiąty pierwszy", + "72": "siedemdziesiąty drugi", + "73": "siedemdziesiąty trzeci", + "74": "siedemdziesiąty czwarty", + "75": "siedemdziesiąty piąty", + "76": "siedemdziesiąty szósty", + "77": "siedemdziesiąty siódmy", + "78": "siedemdziesiąty ósmy", + "79": "siedemdziesiąty dziewiąty", + "80": "osiemdziesiąty", + "81": "osiemdziesiąty pierwszy", + "82": "osiemdziesiąty drugi", + "83": "osiemdziesiąty trzeci", + "84": "osiemdziesiąty czwarty", + "85": "osiemdziesiąty piąty", + "86": "osiemdziesiąty szósty", + "87": "osiemdziesiąty siódmy", + "88": "osiemdziesiąty ósmy", + "89": "osiemdziesiąty dziewiąty", + "90": "dziewięćdziesiąty", + "91": "dziewięćdziesiąty pierwszy", + "92": "dziewięćdziesiąty drugi", + "93": "dziewięćdziesiąty trzeci", + "94": "dziewięćdziesiąty czwarty", + "95": "dziewięćdziesiąty piąty", + "96": "dziewięćdziesiąty szósty", + "97": "dziewięćdziesiąty siódmy", + "98": "dziewięćdziesiąty ósmy", + "99": "dziewięćdziesiąty dziewiąty" +} From 0064b742d3f6a1249bd1230a85c6a2199957b3bf Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 4 Jul 2024 16:05:01 +0200 Subject: [PATCH 43/67] Update credits and reduce the number of links --- CREDITS.md | 62 +++++++++-------- novelwriter/assets/text/credits_en.htm | 96 ++++++++++++++------------ 2 files changed, 84 insertions(+), 74 deletions(-) diff --git a/CREDITS.md b/CREDITS.md index 2e18d779..ad199368 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -2,72 +2,74 @@ ## Main Developer -* Veronica Berglyd Olsen (@vkbo) +* Veronica Berglyd Olsen ## Contributors -* Concept: Marian Lückhof (@Number042) -* Internationalisation: Bruno Meneguello (@bkmeneguello) -* Setup and Packaging: Rachel Powers (@Ryex) +* Early Concept: Marian Lückhof +* Internationalisation: Bruno Meneguello +* Setup and Packaging: Rachel Powers For other contributions, see the project's [Contributors](https://github.com/vkbo/novelWriter/graphs/contributors) page. ## Artwork -The artwork on the Welcome dialog was created by [Louis Durrant](https://louisdurrant.art). +The artwork on the Welcome dialog was created by Louis Durrant. ## Translations The default language is English (UK) with English (US) as an option. These are the original translators for the languages currently available: -* Dutch: Martijn van der Kleijn (@mvdkleijn) -* French: Jan Lüdke (@jyhelle) -* German: Myian (@heymyian) -* Italian: Riccardo Mangili -* Japanese: hebekeg (@hebekeg) -* Latin American Spanish: Tommy Marplatt (@tmarplatt) -* Norwegian: Veronica Berglyd Olsen (@vkbo) -* Portuguese: Bruno Meneguello (@bkmeneguello) -* Simplified Chinese: Qianzhi Long (@longqzh) +* **Dutch:** Martijn van der Kleijn (mvdkleijn) +* **French:** Jan Lüdke (jyhelle) +* **German:** Myian (HeyMyian) +* **Italian:** Riccardo Mangili +* **Japanese:** hebekeg +* **Latin American Spanish:** Tommy Marplatt (tmarplatt) +* **Norwegian:** Veronica Berglyd Olsen (vkbo) +* **Polish:** Anna Maria Polak (Nauthiz) +* **Portuguese:** Bruno Meneguello (bkmeneguello) +* **Simplified Chinese:** Qianzhi Long (longqzh) Additional larger translation contributions: -* French: Albert Aribaud (@aaribaud) +* **French:** Albert Aribaud (aaribaud) +* **Portuguese:** Oli Maia (olimaia) Translations are managed on [Crowdin](https://crowdin.com/project/novelwriter), and more -contributions are listed on the project's [Members](https://crowdin.com/project/novelwriter/members) page. +contributions are listed on the project's Members page. ## Libraries The following libraries are dependencies of novelWriter: -* [Qt5](https://www.qt.io) by Qt Company -* [PyQt5](https://www.riverbankcomputing.com/software/pyqt) by Riverbank Computing -* [Enchant](https://abiword.github.io/enchant) by Dom Lachowicz -* [PyEnchant](https://pyenchant.github.io/pyenchant) by Dimitri Merejkowsky +* **Qt5** by Qt Company +* **PyQt5** by Riverbank Computing +* **Enchant** by Dom Lachowicz +* **PyEnchant** by Dimitri Merejkowsky ## Assets Some of the assets bundled with novelWriter were adapted from the following sources: -* [Typicons](https://github.com/stephenhutchings/typicons.font) icons by Stephen Hutchings (CC BY-SA 4.0) -* [Tomorrow](https://github.com/chriskempson/base16) syntax themes by Chris Kempson (MIT License) -* [Owl](https://github.com/sdras/night-owl-vscode-theme) syntax themes by Sarah Drasner (MIT License) -* [Solarized](https://github.com/altercation/solarized) themes by Ethan Schoonover (MIT License) -* [Cyberpunk Night](https://github.com/alemvigh) theme by Anders Lemvigh (CC BY-SA 4.0) -* [Dracula](https://draculatheme.com) theme by Zeno Rocha (MIT License) -* [Snazzy Light](https://github.com/loilo/vscode-snazzy-light) theme by Florian Reuschel (MIT License) +* **Typicons** icons by Stephen Hutchings (CC BY-SA 4.0) +* **Tomorrow** syntax themes by Chris Kempson (MIT License) +* **Owl** syntax themes by Sarah Drasner (MIT License) +* **Solarized** themes by Ethan Schoonover (MIT License) +* **Cyberpunk Night** theme by Anders Lemvigh (CC BY-SA 4.0) +* **Dracula** theme by Zeno Rocha (MIT License) +* **Snazzy Light** theme by Florian Reuschel (MIT License) ## Fonts The font used for the main novelWriter logo, mimetype and text banners is Pridi. Other fonts are used on buttons and icons. -* Pridi by Cadson Demak (Open Font License, Version 1.1) -* Source Sans Pro by Paul D. Hunt (SIL Open Font License) +* **Pridi** by Cadson Demak (Open Font License, Version 1.1) +* **Source Sans Pro** by Paul D. Hunt (SIL Open Font License) ## Special Mentions -Additional thanks to @johnblommers who was an early user and who has provided a lot of very useful +Additional thanks to John Blommers who was an early user and who has provided a lot of very useful feedback over the years. diff --git a/novelwriter/assets/text/credits_en.htm b/novelwriter/assets/text/credits_en.htm index d9889fc3..efedea82 100644 --- a/novelwriter/assets/text/credits_en.htm +++ b/novelwriter/assets/text/credits_en.htm @@ -1,84 +1,92 @@ -

Main Developer

-

Veronica Berglyd Olsen (@vkbo)

+ +

Veronica Berglyd Olsen

Contributors

-

- • Concept: Marian Lückhof (@Number042)
- • Internationalisation: Bruno Meneguello (@bkmeneguello)
- • Setup and Packaging: Rachel Powers (@Ryex) -

+
    +
  • Early Concept: Marian Lückhof
    • +
  • Internationalisation: Bruno Meneguello
    • +
  • Setup and Packaging: Rachel Powers
    • +
+

For other contributions, see the project's Contributors page.

Artwork

-

The artwork on the Welcome dialog was created by Louis Durrant.

+

The artwork on the Welcome dialog was created by Louis Durrant.

Translations

The default language is English (UK) with English (US) as an option. These are the original translators for the languages currently available:

-

- • Dutch: Martijn van der Kleijn (@mvdkleijn)
- • French: Jan Lüdke (@jyhelle)
- • German: Myian (@heymyian)
- • Italian: Riccardo Mangili
- • Japanese: hebekeg (@hebekeg)
- • Latin American Spanish: Tommy Marplatt (@tmarplatt)
- • Norwegian: Veronica Berglyd Olsen (@vkbo)
- • Portuguese: Bruno Meneguello (@bkmeneguello)
- • Simplified Chinese: Qianzhi Long (@longqzh) -

+ +
    +
  • Dutch: Martijn van der Kleijn (mvdkleijn)
    • +
  • French: Jan Lüdke (jyhelle)
    • +
  • German: Myian (HeyMyian)
    • +
  • Italian: Riccardo Mangili
    • +
  • Japanese: hebekeg
    • +
  • Latin American Spanish: Tommy Marplatt (tmarplatt)
    • +
  • Norwegian: Veronica Berglyd Olsen (vkbo)
    • +
  • Polish: Anna Maria Polak (Nauthiz)
    • +
  • Portuguese: Bruno Meneguello (bkmeneguello)
    • +
  • Simplified Chinese: Qianzhi Long (longqzh)
    • +

Additional larger translation contributions:

-

- • French: Albert Aribaud (@aaribaud) -

+ +
    +
  • French: Albert Aribaud (aaribaud)
    • +
  • Portuguese: Oli Maia (olimaia)
    • +

Translations are managed on Crowdin, and -more contributions are listed on the project's Members page.

+more contributions are listed on the project's Members page.

Libraries

The following libraries are dependencies of novelWriter:

-

- • Qt5 by Qt Company
- • PyQt5 by Riverbank Computing
- • Enchant by Dom Lachowicz
- • PyEnchant by Dimitri Merejkowsky -

+ +
    +
  • Qt5 by Qt Company
    • +
  • PyQt5 by Riverbank Computing
    • +
  • Enchant by Dom Lachowicz
    • +
  • PyEnchant by Dimitri Merejkowsky
    • +

Assets

Some of the assets bundled with novelWriter were adapted from the following sources:

-

- • Typicons icons by Stephen Hutchings (CC BY-SA 4.0)
- • Tomorrow syntax themes by Chris Kempson (MIT License)
- • Owl syntax themes by Sarah Drasner (MIT License)
- • Solarized themes by Ethan Schoonover (MIT License)
- • Cyberpunk Night theme by Anders Lemvigh (CC BY-SA 4.0)
- • Dracula theme by Zeno Rocha (MIT License)
- • Snazzy Light theme by Florian Reuschel (MIT License) -

+ +
    +
  • Typicons icons by Stephen Hutchings (CC BY-SA 4.0)
    • +
  • Tomorrow syntax themes by Chris Kempson (MIT License)
    • +
  • Owl syntax themes by Sarah Drasner (MIT License)
    • +
  • Solarized themes by Ethan Schoonover (MIT License)
    • +
  • Cyberpunk Night theme by Anders Lemvigh (CC BY-SA 4.0)
    • +
  • Dracula theme by Zeno Rocha (MIT License)
    • +
  • Snazzy Light theme by Florian Reuschel (MIT License)
    • +

Fonts

The font used for the main novelWriter logo, mimetype and text banners is Pridi. Other fonts are used on buttons and icons.

-

- • Pridi by Cadson Demak (Open Font License, Version 1.1)
- • Source Sans Pro by Paul D. Hunt (SIL Open Font License) -

+ +
    +
  • Pridi by Cadson Demak (Open Font License, Version 1.1)
    • +
  • Source Sans Pro by Paul D. Hunt (SIL Open Font License)
    • +

Special Mentions

-

Additional thanks to @johnblommers who was an early user and who has provided a lot -of very useful feedback over the years.

+

Additional thanks to John Blommers who was an early user and who has provided a lot of very +useful feedback over the years.

From 54c7c5a4633b16a2e506f8a977bfd59cac7f0122 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 4 Jul 2024 16:19:04 +0200 Subject: [PATCH 44/67] Add path info to open project error dialogs (#1944) --- novelwriter/core/project.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/novelwriter/core/project.py b/novelwriter/core/project.py index bd269fa4..f018cfd7 100644 --- a/novelwriter/core/project.py +++ b/novelwriter/core/project.py @@ -254,13 +254,23 @@ class NWProject: status = self._storage.initProjectStorage(projPath, clearLock) if status != NWStorageOpen.READY: if status == NWStorageOpen.UNKOWN: - SHARED.error(self.tr("Not a known project file format.")) + SHARED.error( + self.tr("Not a known project file format."), + info=self.tr("Path: {0}").format(str(projPath)) + ) elif status == NWStorageOpen.NOT_FOUND: - SHARED.error(self.tr("Project file not found.")) + SHARED.error( + self.tr("Project file not found."), + info=self.tr("Path: {0}").format(str(projPath)) + ) + elif status == NWStorageOpen.FAILED: + SHARED.error( + self.tr("Failed to open project."), + info=self.tr("Path: {0}").format(str(projPath)), + exc=self._storage.exc + ) elif status == NWStorageOpen.LOCKED: self._state = NWProjectState.LOCKED - elif status == NWStorageOpen.FAILED: - SHARED.error(self.tr("Failed to open project."), exc=self._storage.exc) return False # Read Project XML From 60169b914a072872cb2e692e9f0837ec5a1ecaf9 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 4 Jul 2024 16:32:01 +0200 Subject: [PATCH 45/67] Revert main to 2.5 RC1 --- novelwriter/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/novelwriter/__init__.py b/novelwriter/__init__.py index 351c3ae0..8a81ae2c 100644 --- a/novelwriter/__init__.py +++ b/novelwriter/__init__.py @@ -47,9 +47,9 @@ __license__ = "GPLv3" __author__ = "Veronica Berglyd Olsen" __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" -__version__ = "2.6a0" -__hexversion__ = "0x020600a0" -__date__ = "2024-06-24" +__version__ = "2.5rc1" +__hexversion__ = "0x020500c1" +__date__ = "2024-06-22" __status__ = "Stable" __domain__ = "novelwriter.io" From 140b22dc63c0b353da172e05762209ab5adeec6f Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 4 Jul 2024 16:42:46 +0200 Subject: [PATCH 46/67] Split GitHub build workflows --- .github/workflows/build.yml | 131 ----------------------------- .github/workflows/build_assets.yml | 41 +++++++++ .github/workflows/build_linux.yml | 43 ++++++++++ .github/workflows/build_mac.yml | 64 ++++++++++++++ 4 files changed, 148 insertions(+), 131 deletions(-) delete mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/build_assets.yml create mode 100644 .github/workflows/build_linux.yml create mode 100644 .github/workflows/build_mac.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 79407646..00000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,131 +0,0 @@ -name: Build - -on: workflow_dispatch - -jobs: - buildAssets: - runs-on: ubuntu-latest - steps: - - name: Python Setup - uses: actions/setup-python@v5 - with: - python-version: "3.12" - architecture: x64 - - - name: Install Packages (apt) - run: | - sudo apt update - sudo apt install qttools5-dev-tools latexmk texlive texlive-latex-extra - - - name: Checkout Source - uses: actions/checkout@v4 - - - name: Install Packages (pip) - run: pip install -r docs/source/requirements.txt - - - name: Build Assets - run: python pkgutils.py qtlrelease sample manual - - - name: Upload Artifacts - uses: actions/upload-artifact@v4 - with: - name: nw-assets - path: | - novelwriter/assets/sample.zip - novelwriter/assets/manual.pdf - novelwriter/assets/i18n/*.qm - if-no-files-found: error - retention-days: 14 - - buildLinux: - needs: buildAssets - runs-on: ubuntu-latest - env: - PYTHON_VERSION: "3.12" - LINUX_TAG: "manylinux_2_28_x86_64" - steps: - - name: Python Setup - uses: actions/setup-python@v5 - with: - python-version: "3.11" - architecture: x64 - - - name: Install Packages (pip) - run: pip install python-appimage - - - name: Checkout Source - uses: actions/checkout@v4 - - - name: Download Artifacts - uses: actions/download-artifact@v4 - with: - name: nw-assets - path: novelwriter/assets - - - name: Build AppImage - run: python pkgutils.py build-appimage --linux-tag $LINUX_TAG --python-version $PYTHON_VERSION - - - name: Upload Artifacts - uses: actions/upload-artifact@v4 - with: - name: Linux-AppImage - path: dist_appimage - if-no-files-found: error - retention-days: 14 - - buildMac-AMD64: - needs: buildAssets - # Stay on macos-12 due to https://github.com/create-dmg/create-dmg/issues/143 - runs-on: macos-12 - env: - PYTHON_VERSION: "3.12" - PACKAGE_ARCH: x86_64 - MINICONDA_ARCH: x86_64 - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Download Artifacts - uses: actions/download-artifact@v4 - with: - name: nw-assets - path: novelwriter/assets - - - name: Build App Bundle - run: ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH - - - name: Upload DMG - uses: actions/upload-artifact@v4 - with: - name: MacOS-AMD64-DMG - path: dist_macos - if-no-files-found: error - retention-days: 14 - - buildMac-M1: - needs: buildAssets - runs-on: macos-14 - env: - PYTHON_VERSION: "3.12" - PACKAGE_ARCH: aarch64 - MINICONDA_ARCH: arm64 - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Download Artifacts - uses: actions/download-artifact@v4 - with: - name: nw-assets - path: novelwriter/assets - - - name: Build App Bundle - run: ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH - - - name: Upload DMG - uses: actions/upload-artifact@v4 - with: - name: MacOS-M1-DMG - path: dist_macos - if-no-files-found: error - retention-days: 14 diff --git a/.github/workflows/build_assets.yml b/.github/workflows/build_assets.yml new file mode 100644 index 00000000..05579f59 --- /dev/null +++ b/.github/workflows/build_assets.yml @@ -0,0 +1,41 @@ +name: BuildAssets + +on: workflow_call + +jobs: + buildAssets: + runs-on: ubuntu-latest + steps: + - name: Python Setup + uses: actions/setup-python@v5 + with: + python-version: "3.12" + architecture: x64 + + - name: Install Packages (apt) + run: | + sudo apt update + sudo apt install qttools5-dev-tools latexmk texlive texlive-latex-extra + + - name: Checkout Source + uses: actions/checkout@v4 + + - name: Install Packages (pip) + run: pip install -r docs/source/requirements.txt + + - name: Build Assets + run: | + python pkgutils.py manual + python pkgutils.py sample + python pkgutils.py qtlrelease + + - name: Upload Artifacts + uses: actions/upload-artifact@v4 + with: + name: nw-assets + path: | + novelwriter/assets/manual.pdf + novelwriter/assets/sample.zip + novelwriter/assets/i18n/*.qm + if-no-files-found: error + retention-days: 14 diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml new file mode 100644 index 00000000..e6c8705a --- /dev/null +++ b/.github/workflows/build_linux.yml @@ -0,0 +1,43 @@ +name: BuildLinux + +on: workflow_dispatch + +jobs: + buildAssets: + uses: ./.github/workflows/build_assets.yml + + buildLinux: + needs: buildAssets + runs-on: ubuntu-latest + env: + PYTHON_VERSION: "3.12" + LINUX_TAG: "manylinux_2_28_x86_64" + steps: + - name: Python Setup + uses: actions/setup-python@v5 + with: + python-version: "3.11" + architecture: x64 + + - name: Install Packages (pip) + run: pip install python-appimage + + - name: Checkout Source + uses: actions/checkout@v4 + + - name: Download Artifacts + uses: actions/download-artifact@v4 + with: + name: nw-assets + path: novelwriter/assets + + - name: Build AppImage + run: python pkgutils.py build-appimage --linux-tag $LINUX_TAG --python-version $PYTHON_VERSION + + - name: Upload Artifacts + uses: actions/upload-artifact@v4 + with: + name: Linux-AppImage + path: dist_appimage + if-no-files-found: error + retention-days: 14 diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml new file mode 100644 index 00000000..704d3e6e --- /dev/null +++ b/.github/workflows/build_mac.yml @@ -0,0 +1,64 @@ +name: BuildMacOS + +on: workflow_dispatch + +jobs: + buildAssets: + uses: ./.github/workflows/build_assets.yml + + buildMac-AMD64: + needs: buildAssets + # Stay on macos-12 due to https://github.com/create-dmg/create-dmg/issues/143 + runs-on: macos-12 + env: + PYTHON_VERSION: "3.12" + PACKAGE_ARCH: x86_64 + MINICONDA_ARCH: x86_64 + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Download Artifacts + uses: actions/download-artifact@v4 + with: + name: nw-assets + path: novelwriter/assets + + - name: Build App Bundle + run: ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH + + - name: Upload DMG + uses: actions/upload-artifact@v4 + with: + name: MacOS-AMD64-DMG + path: dist_macos + if-no-files-found: error + retention-days: 14 + + buildMac-M1: + needs: buildAssets + runs-on: macos-14 + env: + PYTHON_VERSION: "3.12" + PACKAGE_ARCH: aarch64 + MINICONDA_ARCH: arm64 + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Download Artifacts + uses: actions/download-artifact@v4 + with: + name: nw-assets + path: novelwriter/assets + + - name: Build App Bundle + run: ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH + + - name: Upload DMG + uses: actions/upload-artifact@v4 + with: + name: MacOS-M1-DMG + path: dist_macos + if-no-files-found: error + retention-days: 14 From e80a9824f6d70d42dfca022436448fb3935ec947 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 4 Jul 2024 16:47:39 +0200 Subject: [PATCH 47/67] Add placeholder Windows build job --- .github/workflows/build_win.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/build_win.yml diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml new file mode 100644 index 00000000..c16e5340 --- /dev/null +++ b/.github/workflows/build_win.yml @@ -0,0 +1,19 @@ +name: BuildWindows + +on: workflow_dispatch + +jobs: + buildAssets: + uses: ./.github/workflows/build_assets.yml + + buildWin64: + needs: buildAssets + runs-on: windows-latest + steps: + - name: Python Setup + uses: actions/setup-python@v5 + with: + python-version: "3.12" + architecture: x64 + - name: Checkout Source + uses: actions/checkout@v4 From 1b8867537ed489c9eed45d9d915ca53d4569af68 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 4 Jul 2024 18:34:10 +0200 Subject: [PATCH 48/67] Update all assets commands to pkgutils --- .github/workflows/build_linux.yml | 2 +- pkgutils.py | 566 ++++++++++++++++-------------- setup/make_pip.sh | 2 +- setup/make_release.sh | 3 +- 4 files changed, 303 insertions(+), 270 deletions(-) diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index e6c8705a..9c607318 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -6,7 +6,7 @@ jobs: buildAssets: uses: ./.github/workflows/build_assets.yml - buildLinux: + buildLinux-AppImage: needs: buildAssets runs-on: ubuntu-latest env: diff --git a/pkgutils.py b/pkgutils.py index 657e41e1..45521f27 100755 --- a/pkgutils.py +++ b/pkgutils.py @@ -25,6 +25,7 @@ along with this program. If not, see . """ from __future__ import annotations +import argparse import datetime import email.utils import os @@ -40,6 +41,8 @@ OS_LINUX = 1 OS_WIN = 2 OS_DARWIN = 3 +CURR_DIR = Path(__file__).parent + # =============================================================================================== # # Utilities @@ -131,11 +134,21 @@ def makeCheckSum(sumFile: str, cwd: str | None = None) -> str: # General # =============================================================================================== # +## +# Print Version +## + +def printVersion(args: argparse.Namespace) -> None: + """Print the novelWriter version and exit.""" + print(extractVersion(beQuiet=True)[0], end=None) + return + + ## # Package Installer (pip) ## -def installPackages(hostOS: int) -> None: +def installPackages(args: argparse.Namespace) -> None: """Install package dependencies both for this script and for running novelWriter itself. """ @@ -145,9 +158,9 @@ def installPackages(hostOS: int) -> None: print("") installQueue = ["pip", "-r requirements.txt"] - if hostOS == OS_DARWIN: + if args.mac: installQueue.append("pyobjc") - elif hostOS == OS_WIN: + elif args.win: installQueue.append("pywin32") pyCmd = [sys.executable, "-m"] @@ -168,28 +181,30 @@ def installPackages(hostOS: int) -> None: # Clean Build and Dist Folders (build-clean) ## -def cleanBuildDirs() -> None: +def cleanBuildDirs(args: argparse.Namespace) -> None: """Recursively delete the 'build' and 'dist' folders.""" print("") print("Cleaning up build environment ...") print("") - def removeFolder(rmDir: str) -> None: - if os.path.isdir(rmDir): - try: - shutil.rmtree(rmDir) - print("Deleted: %s" % rmDir) - except OSError: - print("Failed: %s" % rmDir) - else: - print("Missing: %s" % rmDir) + folders = [ + CURR_DIR / "build", + CURR_DIR / "dist", + CURR_DIR / "dist_deb", + CURR_DIR / "dist_minimal", + CURR_DIR / "dist_appimage", + CURR_DIR / "novelWriter.egg-info", + ] - removeFolder("build") - removeFolder("dist") - removeFolder("dist_deb") - removeFolder("dist_minimal") - removeFolder("dist_appimage") - removeFolder("novelWriter.egg-info") + for folder in folders: + if folder.is_dir(): + try: + shutil.rmtree(folder) + print("Deleted: %s" % folder) + except OSError: + print("Failed: %s" % folder) + else: + print("Missing: %s" % folder) print("") @@ -204,28 +219,23 @@ def cleanBuildDirs() -> None: # Build PDF Manual (manual) ## -def buildPdfManual() -> None: +def buildPdfManual(args: argparse.Namespace | None = None) -> None: """This function will build the documentation as manual.pdf.""" print("") print("Building PDF Manual") print("===================") print("") - buildFile = os.path.join("docs", "build", "latex", "manual.pdf") - finalFile = os.path.join("novelwriter", "assets", "manual.pdf") - - if os.path.isfile(finalFile): - # Make sure a new file is always generated - os.unlink(finalFile) + buildFile = CURR_DIR / "docs" / "build" / "latex" / "manual.pdf" + finalFile = CURR_DIR / "novelwriter" / "assets" / "manual.pdf" + finalFile.unlink(missing_ok=True) try: subprocess.call(["make", "clean"], cwd="docs") exCode = subprocess.call(["make", "latexpdf"], cwd="docs") if exCode == 0: - if os.path.isfile(finalFile): - os.unlink(finalFile) print("") - os.rename(buildFile, finalFile) + buildFile.rename(finalFile) else: raise Exception(f"Build returned error code {exCode}") @@ -255,53 +265,36 @@ def buildPdfManual() -> None: ## -# Qt Linguist QM Builder (qtlrelease) +# Sample Project ZIP File Builder (sample) ## -def buildQtI18n() -> None: - """Build the lang.qm files for Qt Linguist.""" +def buildSampleZip(args: argparse.Namespace | None = None) -> None: + """Bundle the sample project into a single zip file to be saved into + the novelwriter/assets folder for further bundling into builds. + """ print("") - print("Building Qt Localisation Files") - print("==============================") - - print("") - print("TS Files to Build:") + print("Building Sample ZIP File") + print("========================") print("") - tsList = [] - for aFile in os.listdir("i18n"): - aPath = os.path.join("i18n", aFile) - if os.path.isfile(aPath) and aFile.endswith(".ts") and aFile != "nw_base.ts": - tsList.append(aPath) - print(aPath) + srcSample = CURR_DIR / "sample" + dstSample = CURR_DIR / "novelwriter" / "assets" / "sample.zip" - print("") - print("Building Translation Files:") - print("") + if srcSample.is_dir(): + dstSample.unlink(missing_ok=True) + with zipfile.ZipFile(dstSample, "w") as zipObj: + print("Compressing: nwProject.nwx") + zipObj.write(srcSample / "nwProject.nwx", "nwProject.nwx") + for doc in (srcSample / "content").iterdir(): + print(f"Compressing: content/{doc.name}") + zipObj.write(doc, f"content/{doc.name}") - try: - subprocess.call(["lrelease", "-verbose", *tsList]) - except Exception as exc: - print("Qt5 Linguist tools seem to be missing") - print("On Debian/Ubuntu, install: qttools5-dev-tools pyqt5-dev-tools") - print(str(exc)) + else: + print("Error: Could not find sample project source directory.") sys.exit(1) print("") - print("Moving QM Files to Assets") - print("") - - langDir = os.path.join("novelwriter", "assets", "i18n") - for langFile in os.listdir("i18n"): - langPath = os.path.join("i18n", langFile) - if not os.path.isfile(langPath): - continue - - if langFile.endswith(".qm"): - destPath = os.path.join(langDir, langFile) - os.rename(langPath, destPath) - print("Moved: %s -> %s" % (langPath, destPath)) - + print("Built file: %s" % dstSample) print("") return @@ -311,13 +304,14 @@ def buildQtI18n() -> None: # Qt Linguist TS Builder (qtlupdate) ## -def buildQtI18nTS(sysArgs: list[str]) -> None: +def updateTranslationSources(args: argparse.Namespace) -> None: """Build the lang.ts files for Qt Linguist.""" print("") print("Building Qt Translation Files") print("=============================") try: + # Using the pylupdate tool from PyQt6 as it supports TS file format 2.1. from PyQt6.lupdate.lupdate import lupdate except ImportError: print("ERROR: This command requires lupdate from PyQt6") @@ -328,65 +322,141 @@ def buildQtI18nTS(sysArgs: list[str]) -> None: print("Scanning Source Tree:") print("") - sources = [os.path.join("i18n", "qtbase.py")] - for root, _, files in os.walk("novelwriter"): - if os.path.isdir(root): - for file in files: - source = os.path.join(root, file) - if os.path.isfile(source) and file.endswith(".py"): - sources.append(source) - + sources = list((CURR_DIR / "novelwriter").glob("**/*.py")) + sources.insert(0, CURR_DIR / "i18n" / "qtbase.py") for source in sources: - print(source) + print(source.relative_to(CURR_DIR)) print("") print("TS Files to Update:") print("") translations = [] - if len(sysArgs) >= 2: - for arg in sysArgs[1:]: - if not (arg.startswith("i18n") and arg.endswith(".ts")): - continue + for item in [Path(str(f)).absolute() for f in args.files]: + if not (item.name.startswith("nw_") and item.suffix == ".ts"): + print(f"Skipped: {item}") + continue - file = os.path.basename(arg) - if not file.startswith("nw_") and len(file) > 6: - print("Skipping non-novelWriter TS file %s" % file) - continue - - if os.path.isfile(arg): - translations.append(arg) - elif os.path.exists(arg): - pass - else: # Create an empty new language file - langCode = file[3:-3] - writeFile(arg, ( - "\n" - "\n" - f"\n" - )) - translations.append(arg) - - else: - print("No translation files selected for update ...") - print("") - return - - for translation in translations: - print(translation) + if item.is_file(): + translations.append(item) + print(f"Added: {item}") + elif item.exists(): + continue + else: # Create an empty new language file + langCode = item.name[3:-3] + item.write_text( + "\n" + "\n" + f"\n" + ) + translations.append(item) + print(f"Created: {item}") print("") print("Updating Language Files:") print("") - # Using the pylupdate tool from PyQt6 as it supports TS file format 2.1. - lupdate(sources, translations, no_obsolete=True, no_summary=False) + lupdate( + sources=[str(f) for f in sources], + translation_files=[str(f) for f in translations], + no_obsolete=True, + no_summary=False, + ) print("") return +## +# Qt Linguist QM Builder (qtlrelease) +## + +def buildTranslationAssets(args: argparse.Namespace | None = None) -> None: + """Build the lang.qm files for Qt Linguist.""" + print("") + print("Building Qt Localisation Files") + print("==============================") + + print("") + print("TS Files to Build:") + print("") + + srcDir = CURR_DIR / "i18n" + dstDir = CURR_DIR / "novelwriter" / "assets" / "i18n" + + srcList = [] + for item in srcDir.iterdir(): + if item.is_file() and item.suffix == ".ts" and item.name != "nw_base.ts": + srcList.append(item) + print(item) + + print("") + print("Building Translation Files:") + print("") + + try: + subprocess.call(["lrelease", "-verbose", *srcList]) + except Exception as exc: + print("Qt5 Linguist tools seem to be missing") + print("On Debian/Ubuntu, install: qttools5-dev-tools pyqt5-dev-tools") + print(str(exc)) + sys.exit(1) + + print("") + print("Moving QM Files to Assets") + print("") + + dstRel = dstDir.relative_to(CURR_DIR) + for item in srcDir.iterdir(): + if item.is_file() and item.suffix == ".qm": + item.rename(dstDir / item.name) + print("Moved: %s -> %s" % (item.relative_to(CURR_DIR), dstRel / item.name)) + + print("") + + return + + +## +# Clean Assets (clean-assets) +## + +def cleanBuiltAssets(args: argparse.Namespace | None = None) -> None: + """Remove assets built by this script.""" + print("") + print("Removing Built Assets") + print("=====================") + print("") + + assets = [ + CURR_DIR / "novelwriter" / "assets" / "sample.zip", + CURR_DIR / "novelwriter" / "assets" / "manual.pdf", + ] + assets.extend((CURR_DIR / "novelwriter" / "assets" / "i18n").glob("*.qm")) + for asset in assets: + if asset.is_file(): + asset.unlink() + print(f"Deleted: {asset.relative_to(CURR_DIR)}") + + print("") + + return + + +## +# Build Assets (build-assets) +## + +def buildAllAssets(args: argparse.Namespace) -> None: + """Build all assets.""" + cleanBuiltAssets() + buildPdfManual() + buildSampleZip() + buildTranslationAssets() + return + + ## # Generate MacOS PList ## @@ -414,76 +484,6 @@ def genMacOSPlist() -> None: return -## -# Sample Project ZIP File Builder (sample) -## - -def buildSampleZip() -> None: - """Bundle the sample project into a single zip file to be saved into - the novelwriter/assets folder for further bundling into builds. - """ - print("") - print("Building Sample ZIP File") - print("========================") - print("") - - srcSample = "sample" - dstSample = os.path.join("novelwriter", "assets", "sample.zip") - - if os.path.isdir(srcSample): - if os.path.isfile(dstSample): - os.unlink(dstSample) - - from zipfile import ZipFile - - with ZipFile(dstSample, "w") as zipObj: - print("Compressing: nwProject.nwx") - zipObj.write(os.path.join(srcSample, "nwProject.nwx"), "nwProject.nwx") - for docFile in os.listdir(os.path.join(srcSample, "content")): - print("Compressing: content/%s" % docFile) - srcDoc = os.path.join(srcSample, "content", docFile) - zipObj.write(srcDoc, "content/"+docFile) - - else: - print("Error: Could not find sample project source directory.") - sys.exit(1) - - print("") - print("Built file: %s" % dstSample) - print("") - - return - - -def cleanBuiltAssets() -> None: - """Remove assets built by this script.""" - print("") - print("Removing Built Assets") - print("=====================") - print("") - - sampleZip = os.path.join("novelwriter", "assets", "sample.zip") - if os.path.isfile(sampleZip): - print(f"Deleted: {sampleZip}") - os.unlink(sampleZip) - - pdfManual = os.path.join("novelwriter", "assets", "manual.pdf") - if os.path.isfile(pdfManual): - print(f"Deleted: {pdfManual}") - os.unlink(pdfManual) - - i18nAssets = os.path.join("novelwriter", "assets", "i18n") - for i18nItem in os.listdir(i18nAssets): - i18nPath = os.path.join(i18nAssets, i18nItem) - if os.path.isfile(i18nPath) and i18nPath.endswith(".qm"): - print(f"Deleted: {i18nPath}") - os.unlink(i18nPath) - - print("") - - return - - def checkAssetsExist() -> bool: """Check that the necessary compiled assets exist ahead of a build. """ @@ -1533,6 +1533,10 @@ def xdgUninstall() -> None: if __name__ == "__main__": """Parse command line options and run the commands.""" # Detect OS + isLinux = sys.platform.startswith("linux") + isMacOS = sys.platform.startswith("darwin") + isWin = sys.platform.startswith("win32") + if sys.platform.startswith("linux"): hostOS = OS_LINUX elif sys.platform.startswith("darwin"): @@ -1546,6 +1550,9 @@ if __name__ == "__main__": sysArgs = sys.argv.copy() + parser = argparse.ArgumentParser() + parsers = parser.add_subparsers() + # Sign package if "--sign" in sysArgs: sysArgs.remove("--sign") @@ -1610,115 +1617,142 @@ if __name__ == "__main__": "", ] + # Version + cmdVersion = parsers.add_parser( + "version", help="Print the novelWriter version." + ) + cmdVersion.set_defaults(func=printVersion) + # General # ======= - if "help" in sysArgs: - sysArgs.remove("help") - print("\n".join(helpMsg)) - sys.exit(0) + # Pip Install + cmdPipInstall = parsers.add_parser( + "pip", help="Install all package dependencies for novelWriter using pip." + ) + cmdPipInstall.add_argument("--linux", action="store_true", help="For Linux.", default=isLinux) + cmdPipInstall.add_argument("--mac", action="store_true", help="For MacOS.", default=isMacOS) + cmdPipInstall.add_argument("--win", action="store_true", help="For Windows.", default=isWin) + cmdPipInstall.set_defaults(func=installPackages) - if "version" in sysArgs: - sysArgs.remove("version") - print(extractVersion(beQuiet=True)[0], end=None) - sys.exit(0) - - if "pip" in sysArgs: - sysArgs.remove("pip") - installPackages(hostOS) - - if "build-clean" in sysArgs: - sysArgs.remove("build-clean") - cleanBuildDirs() + # Build Clean + cmdBuildClean = parsers.add_parser( + "build-clean", help="Recursively delete all build folders." + ) + cmdBuildClean.set_defaults(func=cleanBuildDirs) # Additional Builds # ================= - if "manual" in sysArgs: - sysArgs.remove("manual") - buildPdfManual() + # Build Manual + cmdBuildManual = parsers.add_parser( + "manual", help="Build the help documentation as a PDF (requires LaTeX)." + ) + cmdBuildManual.set_defaults(func=buildPdfManual) - if "qtlrelease" in sysArgs: - sysArgs.remove("qtlrelease") - buildQtI18n() + # Build Sample + cmdBuildSample = parsers.add_parser( + "sample", help="Build the sample project zip file and add it to assets." + ) + cmdBuildSample.set_defaults(func=buildSampleZip) - if "qtlupdate" in sysArgs: - sysArgs.remove("qtlupdate") - buildQtI18nTS(sysArgs) - sys.exit(0) # Don't continue execution + # Update i18n Sources + cmdUpdateTS = parsers.add_parser( + "qtlupdate", help=( + "Update translation files for internationalisation. " + "The files to be updated must be provided as arguments. " + "New files can be created by giving a 'nw_.ts' file name " + "where is a valid language code." + ) + ) + cmdUpdateTS.add_argument("files", nargs="+") + cmdUpdateTS.set_defaults(func=updateTranslationSources) - if "sample" in sysArgs: - sysArgs.remove("sample") - buildSampleZip() + # Build i18n Files + cmdBuildQM = parsers.add_parser( + "qtlrelease", help="Build the language files for internationalisation." + ) + cmdBuildQM.set_defaults(func=buildTranslationAssets) - if "clean-assets" in sysArgs: - sysArgs.remove("clean-assets") - cleanBuiltAssets() + # Clean Assets + cmdCleanAssets = parsers.add_parser( + "clean-assets", help="Delete assets built by manual, sample and qtlrelease." + ) + cmdCleanAssets.set_defaults(func=cleanBuiltAssets) - if "gen-plist" in sysArgs: - sysArgs.remove("gen-plist") - genMacOSPlist() + # Build Assets + cmdBuildAssets = parsers.add_parser( + "build-assets", help="Build all assets. Includes manual, sample and qtlrelease." + ) + cmdBuildAssets.set_defaults(func=buildAllAssets) - # Python Packaging - # ================ + # if "gen-plist" in sysArgs: + # sysArgs.remove("gen-plist") + # genMacOSPlist() - if "import-i18n" in sysArgs: - sysArgs.remove("import-i18n") - importI18nUpdates(sysArgs) - sys.exit(0) # Don't continue execution + # # Python Packaging + # # ================ - if "windows-zip" in sysArgs: - sysArgs.remove("windows-zip") - makeWindowsZip() + # if "import-i18n" in sysArgs: + # sysArgs.remove("import-i18n") + # importI18nUpdates(sysArgs) + # sys.exit(0) # Don't continue execution - if "build-deb" in sysArgs: - sysArgs.remove("build-deb") - if hostOS == OS_LINUX: - if doSign: - signKey = "D6A9F6B8F227CF7C6F6D1EE84DBBE4B734B0BD08" - else: - signKey = None - makeDebianPackage(signKey=signKey) - else: - print("ERROR: Command 'build-deb' can only be used on Linux") - sys.exit(1) + # if "windows-zip" in sysArgs: + # sysArgs.remove("windows-zip") + # makeWindowsZip() - if "build-ubuntu" in sysArgs: - sysArgs.remove("build-ubuntu") - if hostOS == OS_LINUX: - makeForLaunchpad(doSign=doSign, isFirst=isFirstBuild) - else: - print("ERROR: Command 'build-ubuntu' can only be used on Linux") - sys.exit(1) + # if "build-deb" in sysArgs: + # sysArgs.remove("build-deb") + # if hostOS == OS_LINUX: + # if doSign: + # signKey = "D6A9F6B8F227CF7C6F6D1EE84DBBE4B734B0BD08" + # else: + # signKey = None + # makeDebianPackage(signKey=signKey) + # else: + # print("ERROR: Command 'build-deb' can only be used on Linux") + # sys.exit(1) - if "build-win-exe" in sysArgs: - sysArgs.remove("build-win-exe") - makeWindowsEmbedded(sysArgs) - sys.exit(0) # Don't continue execution + # if "build-ubuntu" in sysArgs: + # sysArgs.remove("build-ubuntu") + # if hostOS == OS_LINUX: + # makeForLaunchpad(doSign=doSign, isFirst=isFirstBuild) + # else: + # print("ERROR: Command 'build-ubuntu' can only be used on Linux") + # sys.exit(1) - if "build-appimage" in sysArgs: - sysArgs.remove("build-appimage") - if hostOS == OS_LINUX: - sysArgs = makeAppImage(sysArgs) - else: - print("ERROR: Command 'build-appimage' can only be used on Linux") - sys.exit(1) + # if "build-win-exe" in sysArgs: + # sysArgs.remove("build-win-exe") + # makeWindowsEmbedded(sysArgs) + # sys.exit(0) # Don't continue execution - # General Installers - # ================== + # if "build-appimage" in sysArgs: + # sysArgs.remove("build-appimage") + # if hostOS == OS_LINUX: + # sysArgs = makeAppImage(sysArgs) + # else: + # print("ERROR: Command 'build-appimage' can only be used on Linux") + # sys.exit(1) - if "xdg-install" in sysArgs: - sysArgs.remove("xdg-install") - if hostOS == OS_WIN: - print("ERROR: Command 'xdg-install' cannot be used on Windows") - sys.exit(1) - else: - xdgInstall() + # # General Installers + # # ================== - if "xdg-uninstall" in sysArgs: - sysArgs.remove("xdg-uninstall") - if hostOS == OS_WIN: - print("ERROR: Command 'xdg-uninstall' cannot be used on Windows") - sys.exit(1) - else: - xdgUninstall() + # if "xdg-install" in sysArgs: + # sysArgs.remove("xdg-install") + # if hostOS == OS_WIN: + # print("ERROR: Command 'xdg-install' cannot be used on Windows") + # sys.exit(1) + # else: + # xdgInstall() + + # if "xdg-uninstall" in sysArgs: + # sysArgs.remove("xdg-uninstall") + # if hostOS == OS_WIN: + # print("ERROR: Command 'xdg-uninstall' cannot be used on Windows") + # sys.exit(1) + # else: + # xdgUninstall() + + args = parser.parse_args() + args.func(args) diff --git a/setup/make_pip.sh b/setup/make_pip.sh index 7d3817e0..6ddf21bc 100755 --- a/setup/make_pip.sh +++ b/setup/make_pip.sh @@ -18,7 +18,7 @@ if [ ! -d $ENVPATH ]; then fi source $ENVPATH/bin/activate pip3 install -r docs/source/requirements.txt -python3 pkgutils.py qtlrelease manual sample +python3 pkgutils.py build-assets deactivate echo "" diff --git a/setup/make_release.sh b/setup/make_release.sh index 0904000f..c5237745 100755 --- a/setup/make_release.sh +++ b/setup/make_release.sh @@ -17,8 +17,7 @@ if [ ! -d $ENVPATH ]; then fi source $ENVPATH/bin/activate pip3 install -r docs/source/requirements.txt -python3 pkgutils.py clean-assets -python3 pkgutils.py qtlrelease manual sample +python3 pkgutils.py build-assets deactivate echo "" From 7c65d22452ca89c5275b5ad97001f24394224338 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 4 Jul 2024 19:45:54 +0200 Subject: [PATCH 49/67] Updated debian packaging code --- pkgutils.py | 356 ++++++++++++++++++++++++---------------------------- 1 file changed, 166 insertions(+), 190 deletions(-) diff --git a/pkgutils.py b/pkgutils.py index 45521f27..d40f37b5 100755 --- a/pkgutils.py +++ b/pkgutils.py @@ -36,12 +36,12 @@ import zipfile from pathlib import Path -OS_NONE = 0 -OS_LINUX = 1 -OS_WIN = 2 -OS_DARWIN = 3 - CURR_DIR = Path(__file__).parent +SIGN_KEY = "D6A9F6B8F227CF7C6F6D1EE84DBBE4B734B0BD08" + +OS_LINUX = sys.platform.startswith("linux") +OS_DARWIN = sys.platform.startswith("darwin") +OS_WIN = sys.platform.startswith("win32") # =============================================================================================== # @@ -90,6 +90,27 @@ def stripVersion(version: str) -> str: return version +def copySourceCode(dst: Path) -> None: + """Copy the novelwriter source tree to path.""" + src = CURR_DIR / "novelwriter" + for item in src.glob("**/*"): + relSrc = item.relative_to(CURR_DIR) + if item.suffix in (".pyc", ".pyo"): + print(f"Ignore: {relSrc}") + continue + + if item.parent.is_dir() and item.parent.name != "__pycache__": + dstDir = dst / relSrc.parent + if not dstDir.exists(): + dstDir.mkdir(parents=True) + print(f"Folder: {dstDir}") + + if item.is_file(): + shutil.copyfile(item, dst / relSrc) + print(f"Copied: {dst / relSrc}") + return + + def readFile(fileName: str) -> str: """Read an entire file and return as a string.""" return Path(fileName).read_text(encoding="utf-8") @@ -112,7 +133,7 @@ def toUpload(srcPath: str | Path, dstName: str | None = None) -> None: return -def makeCheckSum(sumFile: str, cwd: str | None = None) -> str: +def makeCheckSum(sumFile: str, cwd: Path | str | None = None) -> str: """Create a SHA256 checksum file.""" try: if cwd is None: @@ -130,6 +151,32 @@ def makeCheckSum(sumFile: str, cwd: str | None = None) -> str: return shaFile +def checkAssetsExist() -> bool: + """Check that the necessary assets exist ahead of a build.""" + hasSample = False + hasManual = False + hasQmData = False + + sampleZip = os.path.join("novelwriter", "assets", "sample.zip") + if os.path.isfile(sampleZip): + print(f"Found: {sampleZip}") + hasSample = True + + pdfManual = os.path.join("novelwriter", "assets", "manual.pdf") + if os.path.isfile(pdfManual): + print(f"Found: {pdfManual}") + hasManual = True + + i18nAssets = os.path.join("novelwriter", "assets", "i18n") + for i18nItem in os.listdir(i18nAssets): + i18nPath = os.path.join(i18nAssets, i18nItem) + if os.path.isfile(i18nPath) and i18nPath.endswith(".qm"): + print(f"Found: {i18nPath}") + hasQmData = True + + return hasSample and hasManual and hasQmData + + # =============================================================================================== # # General # =============================================================================================== # @@ -484,33 +531,6 @@ def genMacOSPlist() -> None: return -def checkAssetsExist() -> bool: - """Check that the necessary compiled assets exist ahead of a build. - """ - hasSample = False - hasManual = False - hasQmData = False - - sampleZip = os.path.join("novelwriter", "assets", "sample.zip") - if os.path.isfile(sampleZip): - print(f"Found: {sampleZip}") - hasSample = True - - pdfManual = os.path.join("novelwriter", "assets", "manual.pdf") - if os.path.isfile(pdfManual): - print(f"Found: {pdfManual}") - hasManual = True - - i18nAssets = os.path.join("novelwriter", "assets", "i18n") - for i18nItem in os.listdir(i18nAssets): - i18nPath = os.path.join(i18nAssets, i18nItem) - if os.path.isfile(i18nPath) and i18nPath.endswith(".qm"): - print(f"Found: {i18nPath}") - hasQmData = True - - return hasSample and hasManual and hasQmData - - # =============================================================================================== # # Python Packaging # =============================================================================================== # @@ -519,36 +539,32 @@ def checkAssetsExist() -> bool: # Import Translations (import-i18n) ## -def importI18nUpdates(sysArgs: list[str]) -> None: +def importI18nUpdates(args: argparse.Namespace) -> None: """Import new translation files from a zip file.""" print("") print("Import Updated Translations") print("===========================") print("") - fileName = None - if len(sysArgs) >= 2: - if os.path.isfile(sysArgs[1]): - fileName = sysArgs[1] - - if fileName is None: + fileName = Path(args.file).absolute() + if not fileName.is_file(): print("File not found ...") sys.exit(1) - projPath = os.path.join("novelwriter", "assets", "i18n") - mainPath = "i18n" + dstPath = CURR_DIR / "novelwriter" / "assets" / "i18n" + srcPath = CURR_DIR / "i18n" - print("Loading file: %s" % fileName) + print(f"Loading file: {fileName}") with zipfile.ZipFile(fileName) as zipObj: - for archFile in zipObj.namelist(): - if archFile.startswith("nw_") and archFile.endswith(".ts"): - zipObj.extract(archFile, mainPath) - print("Extracted: %s > %s" % (archFile, os.path.join(mainPath, archFile))) - elif archFile.startswith("project_") and archFile.endswith(".json"): - zipObj.extract(archFile, projPath) - print("Extracted: %s > %s" % (archFile, os.path.join(projPath, archFile))) + for item in zipObj.namelist(): + if item.startswith("nw_") and item.endswith(".ts"): + zipObj.extract(item, srcPath) + print(f"Extracted: {item} > {srcPath / item}") + elif item.startswith("project_") and item.endswith(".json"): + zipObj.extract(item, dstPath) + print(f"Extracted: {item} > {dstPath / item}") else: - print("Skipped: %s" % archFile) + print(f"Skipped: {item}") print("") @@ -628,7 +644,7 @@ def makeWindowsZip() -> None: ## -# Make Debian Package (build-deb) +# Make Debian Package ## def makeDebianPackage( @@ -660,21 +676,20 @@ def makeDebianPackage( # Set Up Folder # ============= - bldDir = "dist_deb" + refDir = CURR_DIR / "setup" + bldDir = CURR_DIR / "dist_deb" bldPkg = f"novelwriter_{pkgVers}" - outDir = f"{bldDir}/{bldPkg}" - debDir = f"{outDir}/debian" - datDir = f"{outDir}/data" + outDir = bldDir / bldPkg + debDir = outDir / "debian" + datDir = outDir / "data" - if not os.path.isdir(bldDir): - os.mkdir(bldDir) - - if os.path.isdir(outDir): + bldDir.mkdir(exist_ok=True) + if outDir.exists(): print("Removing old build files ...") print("") shutil.rmtree(outDir) - os.mkdir(outDir) + outDir.mkdir(exist_ok=False) # Check Additional Assets # ======================= @@ -688,29 +703,7 @@ def makeDebianPackage( print("Copying novelWriter source ...") print("") - - for nPath, _, nFiles in os.walk("novelwriter"): - if nPath.endswith("__pycache__"): - print("Skipped: %s" % nPath) - continue - - pPath = f"{outDir}/{nPath}" - if not os.path.isdir(pPath): - os.mkdir(pPath) - - fCount = 0 - for fFile in nFiles: - nFile = f"{nPath}/{fFile}" - pFile = f"{pPath}/{fFile}" - - if fFile.endswith(".pyc"): - print("Skipped: %s" % nFile) - continue - - shutil.copyfile(nFile, pFile) - fCount += 1 - - print("Copied: %s/* [Files: %d]" % (nPath, fCount)) + copySourceCode(outDir) print("") print("Copying or generating additional files ...") @@ -724,63 +717,60 @@ def makeDebianPackage( shutil.copyfile(copyFile, f"{outDir}/{copyFile}") print("Copied: %s" % copyFile) - writeFile(f"{outDir}/MANIFEST.in", ( + (outDir / "MANIFEST.in").write_text( "include LICENSE.md\n" "include CREDITS.md\n" "include CHANGELOG.md\n" "include data/*\n" "recursive-include novelwriter/assets *\n" - )) + ) print("Wrote: MANIFEST.in") - writeFile(f"{outDir}/setup.py", ( + (outDir / "setup.py").write_text( "import setuptools\n" "setuptools.setup()\n" - )) + ) print("Wrote: setup.py") if oldSetuptools: # This is needed for Ubuntu up to 22.04 - setupCfg = readFile("setup/launchpad_setup.cfg").replace( - "file: setup/description_pypi.md", "file: data/description_short.txt" - ) - writeFile(f"{outDir}/setup.cfg", setupCfg) + text = (CURR_DIR / "setup" / "launchpad_setup.cfg").read_text() + text.replace("setup/description_pypi.md", "data/description_short.txt") + (outDir / "setup.cfg").write_text(text) print("Wrote: setup.cfg") - writeFile(f"{outDir}/pyproject.toml", ( + (outDir / "pyproject.toml").write_text( "[build-system]\n" "requires = [\"setuptools\"]\n" "build-backend = \"setuptools.build_meta\"\n" - )) - print("Wrote: pyproject.toml") - - else: - pyProject = readFile("pyproject.toml").replace( - "setup/description_pypi.md", "data/description_short.txt" ) - writeFile(f"{outDir}/pyproject.toml", pyProject) + print("Wrote: pyproject.toml") + else: + text = (CURR_DIR / "pyproject.toml").read_text() + text.replace("setup/description_pypi.md", "data/description_short.txt") + (outDir / "pyproject.toml").write_text(text) print("Wrote: pyproject.toml") # Copy/Write Debian Files # ======================= - shutil.copytree("setup/debian", debDir) + shutil.copytree(refDir / "debian", debDir) print("Copied: debian/*") - writeFile(f"{debDir}/changelog", ( + (debDir / "changelog").write_text( f"novelwriter ({pkgVers}) {distName}; urgency=low\n\n" f" * Update to version {pkgVers}\n\n" f" -- Veronica Berglyd Olsen {pkgDate}\n" - )) + ) print("Wrote: debian/changelog") # Copy/Write Data Files # ===================== - shutil.copytree("setup/data", datDir) + shutil.copytree(refDir / "data", datDir) print("Copied: data/*") - shutil.copyfile("setup/description_short.txt", f"{outDir}/data/description_short.txt") + shutil.copyfile(refDir / "description_short.txt", outDir / "data" / "description_short.txt") print("Copied: data/description_short.txt") # Build Package @@ -797,13 +787,12 @@ def makeDebianPackage( if sourceBuild: subprocess.call(["debuild", "-S"] + signArgs, cwd=outDir) - toUpload(f"{bldDir}/{bldPkg}.tar.xz") + toUpload(bldDir / f"{bldPkg}.tar.xz") else: subprocess.call(["dpkg-buildpackage"] + signArgs, cwd=outDir) - shutil.copyfile(f"{bldDir}/{bldPkg}.tar.xz", f"{bldDir}/{bldPkg}.debian.tar.xz") - toUpload(f"{bldDir}/{bldPkg}.debian.tar.xz") - toUpload(f"{bldDir}/{bldPkg}_all.deb") - + shutil.copyfile(bldDir / f"{bldPkg}.tar.xz", bldDir / f"{bldPkg}.debian.tar.xz") + toUpload(bldDir / f"{bldPkg}.debian.tar.xz") + toUpload(bldDir / f"{bldPkg}_all.deb") toUpload(makeCheckSum(f"{bldPkg}.debian.tar.xz", cwd=bldDir)) toUpload(makeCheckSum(f"{bldPkg}_all.deb", cwd=bldDir)) @@ -819,17 +808,35 @@ def makeDebianPackage( ## -# Make Launchpad Package (build-ubuntu) +# Build Debian Package (build-deb) ## -def makeForLaunchpad(doSign: bool = False, isFirst: bool = False) -> None: +def buildDebianPackage(args: argparse.Namespace) -> None: + """Build a .deb package""" + if not OS_LINUX: + print("ERROR: Command 'build-deb' can only be used on Linux") + sys.exit(1) + signKey = SIGN_KEY if args.sign else None + makeDebianPackage(signKey) + return + + +## +# Build Launchpad Packages (build-ubuntu) +## + +def buildForLaunchpad(args: argparse.Namespace) -> None: """Wrapper for building Debian packages for Launchpad.""" + if not OS_LINUX: + print("ERROR: Command 'build-ubuntu' can only be used on Linux") + sys.exit(1) + print("") print("Launchpad Packages") print("==================") print("") - if isFirst: + if args.first: bldNum = "0" else: bldNum = input("Build number [0]: ") @@ -848,10 +855,7 @@ def makeForLaunchpad(doSign: bool = False, isFirst: bool = False) -> None: print(f" * Ubuntu {distNum} {codeName.title()}") print("") - if doSign: - signKey = "D6A9F6B8F227CF7C6F6D1EE84DBBE4B734B0BD08" - else: - signKey = None + signKey = SIGN_KEY if args.sign else None print(f"Sign Key: {str(signKey)}") print("") @@ -1532,41 +1536,9 @@ def xdgUninstall() -> None: if __name__ == "__main__": """Parse command line options and run the commands.""" - # Detect OS - isLinux = sys.platform.startswith("linux") - isMacOS = sys.platform.startswith("darwin") - isWin = sys.platform.startswith("win32") - - if sys.platform.startswith("linux"): - hostOS = OS_LINUX - elif sys.platform.startswith("darwin"): - hostOS = OS_DARWIN - elif sys.platform.startswith("win32"): - hostOS = OS_WIN - elif sys.platform.startswith("cygwin"): - hostOS = OS_WIN - else: - hostOS = OS_NONE - - sysArgs = sys.argv.copy() - parser = argparse.ArgumentParser() parsers = parser.add_subparsers() - # Sign package - if "--sign" in sysArgs: - sysArgs.remove("--sign") - doSign = True - else: - doSign = False - - # First build - if "--first" in sysArgs: - sysArgs.remove("--first") - isFirstBuild = True - else: - isFirstBuild = False - helpMsg = [ "", "novelWriter Setup Tool", @@ -1630,9 +1602,9 @@ if __name__ == "__main__": cmdPipInstall = parsers.add_parser( "pip", help="Install all package dependencies for novelWriter using pip." ) - cmdPipInstall.add_argument("--linux", action="store_true", help="For Linux.", default=isLinux) - cmdPipInstall.add_argument("--mac", action="store_true", help="For MacOS.", default=isMacOS) - cmdPipInstall.add_argument("--win", action="store_true", help="For Windows.", default=isWin) + cmdPipInstall.add_argument("--linux", action="store_true", help="For Linux.", default=OS_LINUX) + cmdPipInstall.add_argument("--mac", action="store_true", help="For MacOS.", default=OS_DARWIN) + cmdPipInstall.add_argument("--win", action="store_true", help="For Windows.", default=OS_WIN) cmdPipInstall.set_defaults(func=installPackages) # Build Clean @@ -1644,17 +1616,12 @@ if __name__ == "__main__": # Additional Builds # ================= - # Build Manual - cmdBuildManual = parsers.add_parser( - "manual", help="Build the help documentation as a PDF (requires LaTeX)." + # Import Translations + cmdImportTS = parsers.add_parser( + "qtlimport", help="Import updated i18n files from a zip file." ) - cmdBuildManual.set_defaults(func=buildPdfManual) - - # Build Sample - cmdBuildSample = parsers.add_parser( - "sample", help="Build the sample project zip file and add it to assets." - ) - cmdBuildSample.set_defaults(func=buildSampleZip) + cmdImportTS.add_argument("file", help="Path to zip file from Crowdin") + cmdImportTS.set_defaults(func=importI18nUpdates) # Update i18n Sources cmdUpdateTS = parsers.add_parser( @@ -1674,6 +1641,18 @@ if __name__ == "__main__": ) cmdBuildQM.set_defaults(func=buildTranslationAssets) + # Build Manual + cmdBuildManual = parsers.add_parser( + "manual", help="Build the help documentation as a PDF (requires LaTeX)." + ) + cmdBuildManual.set_defaults(func=buildPdfManual) + + # Build Sample + cmdBuildSample = parsers.add_parser( + "sample", help="Build the sample project zip file and add it to assets." + ) + cmdBuildSample.set_defaults(func=buildSampleZip) + # Clean Assets cmdCleanAssets = parsers.add_parser( "clean-assets", help="Delete assets built by manual, sample and qtlrelease." @@ -1686,42 +1665,39 @@ if __name__ == "__main__": ) cmdBuildAssets.set_defaults(func=buildAllAssets) + # Python Packaging + # ================ + + # Build Debian Package + cmdBuildDeb = parsers.add_parser( + "build-deb", help=( + "Build a .deb package for Debian and Ubuntu. " + "Add --sign to sign package." + ) + ) + cmdBuildDeb.add_argument("--sign", action="store_true", help="Sign the package.") + cmdBuildDeb.set_defaults(func=buildDebianPackage) + + # Build Ubuntu Packages + cmdBuildUbuntu = parsers.add_parser( + "build-ubuntu", help=( + "Build a .deb package for Debian and Ubuntu. " + "Add --sign to sign package. " + "Add --first to set build number to 0." + ) + ) + cmdBuildUbuntu.add_argument("--sign", action="store_true", help="Sign the package.") + cmdBuildUbuntu.add_argument("--first", action="store_true", help="Set build number to 0.") + cmdBuildUbuntu.set_defaults(func=buildForLaunchpad) + # if "gen-plist" in sysArgs: # sysArgs.remove("gen-plist") # genMacOSPlist() - # # Python Packaging - # # ================ - - # if "import-i18n" in sysArgs: - # sysArgs.remove("import-i18n") - # importI18nUpdates(sysArgs) - # sys.exit(0) # Don't continue execution - # if "windows-zip" in sysArgs: # sysArgs.remove("windows-zip") # makeWindowsZip() - # if "build-deb" in sysArgs: - # sysArgs.remove("build-deb") - # if hostOS == OS_LINUX: - # if doSign: - # signKey = "D6A9F6B8F227CF7C6F6D1EE84DBBE4B734B0BD08" - # else: - # signKey = None - # makeDebianPackage(signKey=signKey) - # else: - # print("ERROR: Command 'build-deb' can only be used on Linux") - # sys.exit(1) - - # if "build-ubuntu" in sysArgs: - # sysArgs.remove("build-ubuntu") - # if hostOS == OS_LINUX: - # makeForLaunchpad(doSign=doSign, isFirst=isFirstBuild) - # else: - # print("ERROR: Command 'build-ubuntu' can only be used on Linux") - # sys.exit(1) - # if "build-win-exe" in sysArgs: # sysArgs.remove("build-win-exe") # makeWindowsEmbedded(sysArgs) From 4d716555af8e545de9990abb462bed26768633a0 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 4 Jul 2024 20:31:53 +0200 Subject: [PATCH 50/67] Updated AppImage packaging code --- pkgutils.py | 352 +++++++++++++++++++++++----------------------------- 1 file changed, 153 insertions(+), 199 deletions(-) diff --git a/pkgutils.py b/pkgutils.py index d40f37b5..7735dca4 100755 --- a/pkgutils.py +++ b/pkgutils.py @@ -37,6 +37,7 @@ import zipfile from pathlib import Path CURR_DIR = Path(__file__).parent +SETUP_DIR = CURR_DIR / "setup" SIGN_KEY = "D6A9F6B8F227CF7C6F6D1EE84DBBE4B734B0BD08" OS_LINUX = sys.platform.startswith("linux") @@ -90,27 +91,6 @@ def stripVersion(version: str) -> str: return version -def copySourceCode(dst: Path) -> None: - """Copy the novelwriter source tree to path.""" - src = CURR_DIR / "novelwriter" - for item in src.glob("**/*"): - relSrc = item.relative_to(CURR_DIR) - if item.suffix in (".pyc", ".pyo"): - print(f"Ignore: {relSrc}") - continue - - if item.parent.is_dir() and item.parent.name != "__pycache__": - dstDir = dst / relSrc.parent - if not dstDir.exists(): - dstDir.mkdir(parents=True) - print(f"Folder: {dstDir}") - - if item.is_file(): - shutil.copyfile(item, dst / relSrc) - print(f"Copied: {dst / relSrc}") - return - - def readFile(fileName: str) -> str: """Read an entire file and return as a string.""" return Path(fileName).read_text(encoding="utf-8") @@ -347,6 +327,42 @@ def buildSampleZip(args: argparse.Namespace | None = None) -> None: return +## +# Import Translations (import-i18n) +## + +def importI18nUpdates(args: argparse.Namespace) -> None: + """Import new translation files from a zip file.""" + print("") + print("Import Updated Translations") + print("===========================") + print("") + + fileName = Path(args.file).absolute() + if not fileName.is_file(): + print("File not found ...") + sys.exit(1) + + dstPath = CURR_DIR / "novelwriter" / "assets" / "i18n" + srcPath = CURR_DIR / "i18n" + + print(f"Loading file: {fileName}") + with zipfile.ZipFile(fileName) as zipObj: + for item in zipObj.namelist(): + if item.startswith("nw_") and item.endswith(".ts"): + zipObj.extract(item, srcPath) + print(f"Extracted: {item} > {srcPath / item}") + elif item.startswith("project_") and item.endswith(".json"): + zipObj.extract(item, dstPath) + print(f"Extracted: {item} > {dstPath / item}") + else: + print(f"Skipped: {item}") + + print("") + + return + + ## # Qt Linguist TS Builder (qtlupdate) ## @@ -536,37 +552,66 @@ def genMacOSPlist() -> None: # =============================================================================================== # ## -# Import Translations (import-i18n) +# Copy Source ## -def importI18nUpdates(args: argparse.Namespace) -> None: - """Import new translation files from a zip file.""" - print("") - print("Import Updated Translations") - print("===========================") - print("") +def copySourceCode(dst: Path) -> None: + """Copy the novelwriter source tree to path.""" + src = CURR_DIR / "novelwriter" + for item in src.glob("**/*"): + relSrc = item.relative_to(CURR_DIR) + if item.suffix in (".pyc", ".pyo"): + print(f"Ignore: {relSrc}") + continue + if item.parent.is_dir() and item.parent.name != "__pycache__": + dstDir = dst / relSrc.parent + if not dstDir.exists(): + dstDir.mkdir(parents=True) + print(f"Folder: {dstDir}") + if item.is_file(): + shutil.copyfile(item, dst / relSrc) + print(f"Copied: {dst / relSrc}") + return - fileName = Path(args.file).absolute() - if not fileName.is_file(): - print("File not found ...") - sys.exit(1) - dstPath = CURR_DIR / "novelwriter" / "assets" / "i18n" - srcPath = CURR_DIR / "i18n" +## +# Copy Package Files +## - print(f"Loading file: {fileName}") - with zipfile.ZipFile(fileName) as zipObj: - for item in zipObj.namelist(): - if item.startswith("nw_") and item.endswith(".ts"): - zipObj.extract(item, srcPath) - print(f"Extracted: {item} > {srcPath / item}") - elif item.startswith("project_") and item.endswith(".json"): - zipObj.extract(item, dstPath) - print(f"Extracted: {item} > {dstPath / item}") - else: - print(f"Skipped: {item}") +def copyPackageFiles(dst: Path, useCfg: bool = False) -> None: + """Copy files needed for packaging.""" - print("") + copyFiles = ["LICENSE.md", "CREDITS.md", "pyproject.toml"] + for copyFile in copyFiles: + shutil.copyfile(copyFile, dst / copyFile) + print("Copied: %s" % copyFile) + + (dst / "MANIFEST.in").write_text( + "include LICENSE.md\n" + "include CREDITS.md\n" + # "include data/*\n" + "recursive-include novelwriter/assets *\n" + ) + print("Wrote: MANIFEST.in") + + if useCfg: + # This is needed for Ubuntu up to 22.04 + text = (SETUP_DIR / "launchpad_setup.cfg").read_text() + text = text.replace("setup/description_pypi.md", "data/description_short.txt") + (dst / "setup.cfg").write_text(text) + print("Wrote: setup.cfg") + + (dst / "pyproject.toml").write_text( + "[build-system]\n" + "requires = [\"setuptools\"]\n" + "build-backend = \"setuptools.build_meta\"\n" + ) + print("Wrote: pyproject.toml") + else: + text = (CURR_DIR / "pyproject.toml").read_text() + text = text.replace("setup/description_pypi.md", "data/description_short.txt") + (dst / "pyproject.toml").write_text(text) + print("Wrote: pyproject.toml") return @@ -676,7 +721,6 @@ def makeDebianPackage( # Set Up Folder # ============= - refDir = CURR_DIR / "setup" bldDir = CURR_DIR / "dist_deb" bldPkg = f"novelwriter_{pkgVers}" outDir = bldDir / bldPkg @@ -703,58 +747,19 @@ def makeDebianPackage( print("Copying novelWriter source ...") print("") + copySourceCode(outDir) print("") print("Copying or generating additional files ...") print("") - # Copy/Write Root Files - # ===================== - - copyFiles = ["LICENSE.md", "CREDITS.md", "CHANGELOG.md", "pyproject.toml"] - for copyFile in copyFiles: - shutil.copyfile(copyFile, f"{outDir}/{copyFile}") - print("Copied: %s" % copyFile) - - (outDir / "MANIFEST.in").write_text( - "include LICENSE.md\n" - "include CREDITS.md\n" - "include CHANGELOG.md\n" - "include data/*\n" - "recursive-include novelwriter/assets *\n" - ) - print("Wrote: MANIFEST.in") - - (outDir / "setup.py").write_text( - "import setuptools\n" - "setuptools.setup()\n" - ) - print("Wrote: setup.py") - - if oldSetuptools: - # This is needed for Ubuntu up to 22.04 - text = (CURR_DIR / "setup" / "launchpad_setup.cfg").read_text() - text.replace("setup/description_pypi.md", "data/description_short.txt") - (outDir / "setup.cfg").write_text(text) - print("Wrote: setup.cfg") - - (outDir / "pyproject.toml").write_text( - "[build-system]\n" - "requires = [\"setuptools\"]\n" - "build-backend = \"setuptools.build_meta\"\n" - ) - print("Wrote: pyproject.toml") - else: - text = (CURR_DIR / "pyproject.toml").read_text() - text.replace("setup/description_pypi.md", "data/description_short.txt") - (outDir / "pyproject.toml").write_text(text) - print("Wrote: pyproject.toml") + copyPackageFiles(outDir, oldSetuptools) # Copy/Write Debian Files # ======================= - shutil.copytree(refDir / "debian", debDir) + shutil.copytree(SETUP_DIR / "debian", debDir) print("Copied: debian/*") (debDir / "changelog").write_text( @@ -767,10 +772,10 @@ def makeDebianPackage( # Copy/Write Data Files # ===================== - shutil.copytree(refDir / "data", datDir) + shutil.copytree(SETUP_DIR / "data", datDir) print("Copied: data/*") - shutil.copyfile(refDir / "description_short.txt", outDir / "data" / "description_short.txt") + shutil.copyfile(SETUP_DIR / "description_short.txt", outDir / "data" / "description_short.txt") print("Copied: data/description_short.txt") # Build Package @@ -884,14 +889,11 @@ def buildForLaunchpad(args: argparse.Namespace) -> None: ## -# Make AppImage (build-appimage) +# Build AppImage (build-appimage) ## -def makeAppImage(sysArgs: list[str]) -> list[str]: +def buildAppImage(args: argparse.Namespace) -> None: """Build an AppImage.""" - import argparse - import glob - try: import python_appimage # noqa: F401 # type: ignore except ImportError: @@ -901,32 +903,15 @@ def makeAppImage(sysArgs: list[str]) -> list[str]: ) sys.exit(1) + if not OS_LINUX: + print("ERROR: Command 'build-ubuntu' can only be used on Linux") + sys.exit(1) + print("") print("Build AppImage") print("==============") print("") - parser = argparse.ArgumentParser( - prog="build_appimage", - description="Build an AppImage", - epilog="see https://appimage.org/ for more details", - ) - parser.add_argument( - "--linux-tag", - nargs="?", - default="manylinux_2_28_x86_64", - help=( - "Linux compatibility tag (e.g. manylinux_2_28_x86_64)\n" - "see https://python-appimage.readthedocs.io/en/latest/#available-python-appimages \n" - "and https://github.com/pypa/manylinux for a list of valid tags" - ), - ) - parser.add_argument( - "--python-version", nargs="?", default="3.11", help="Python version (e.g. 3.11)" - ) - - args, unparsedArgs = parser.parse_known_args(sysArgs) - linuxTag = args.linux_tag pythonVer = args.python_version @@ -940,129 +925,77 @@ def makeAppImage(sysArgs: list[str]) -> list[str]: # Set Up Folder # ============= - bldDir = "dist_appimage" + bldDir = CURR_DIR / "dist_appimage" bldPkg = f"novelwriter_{pkgVers}" - outDir = f"{bldDir}/{bldPkg}" - imageDir = f"{bldDir}/appimage" + outDir = bldDir / bldPkg + imgDir = bldDir / "appimage" # Set Up Folders # ============== - if not os.path.isdir(bldDir): - os.mkdir(bldDir) + bldDir.mkdir(exist_ok=True) - if os.path.isdir(outDir): + if outDir.exists(): print("Removing old build files ...") print("") shutil.rmtree(outDir) - os.mkdir(outDir) + outDir.mkdir() - if os.path.isdir(imageDir): + if imgDir.exists(): print("Removing old build metadata files ...") print("") - shutil.rmtree(imageDir) + shutil.rmtree(imgDir) - os.mkdir(imageDir) + imgDir.mkdir() # Remove old AppImages - outFiles = glob.glob(f"{bldDir}/*.AppImage") - if outFiles: + if images := bldDir.glob("*.AppImage"): print("Removing old AppImages") print("") - for image in outFiles: - try: - os.remove(image) - except OSError: - print("Error while deleting file : ", image) + for image in images: + image.unlink() # Copy novelWriter Source # ======================= print("Copying novelWriter source ...") print("") - - for nPath, _, nFiles in os.walk("novelwriter"): - if nPath.endswith("__pycache__"): - print("Skipped: %s" % nPath) - continue - - pPath = f"{outDir}/{nPath}" - if not os.path.isdir(pPath): - os.mkdir(pPath) - - fCount = 0 - for fFile in nFiles: - nFile = f"{nPath}/{fFile}" - pFile = f"{pPath}/{fFile}" - - if fFile.endswith(".pyc"): - print("Skipped: %s" % nFile) - continue - - shutil.copyfile(nFile, pFile) - fCount += 1 - - print("Copied: %s/* [Files: %d]" % (nPath, fCount)) + copySourceCode(outDir) print("") print("Copying or generating additional files ...") print("") - # Copy/Write Root Files - # ===================== - - copyFiles = ["LICENSE.md", "CREDITS.md", "CHANGELOG.md", "pyproject.toml"] - for copyFile in copyFiles: - shutil.copyfile(copyFile, f"{outDir}/{copyFile}") - print("Copied: %s" % copyFile) - - writeFile(f"{outDir}/MANIFEST.in", ( - "include LICENSE.md\n" - "include CREDITS.md\n" - "include CHANGELOG.md\n" - "include data/*\n" - "recursive-include novelwriter/assets *\n" - )) - print("Wrote: MANIFEST.in") - - writeFile(f"{outDir}/setup.py", ( - "import setuptools\n" - "setuptools.setup()\n" - )) - print("Wrote: setup.py") - - setupCfg = readFile("pyproject.toml").replace( - "setup/description_pypi.md", "data/description_short.txt" - ) - writeFile(f"{outDir}/pyproject.toml", setupCfg) - print("Wrote: pyproject.toml") + copyPackageFiles(outDir) # Write Metadata # ============== - appDescription = readFile("setup/description_short.txt") - appdataXML = readFile("setup/novelwriter.appdata.xml").format(description=appDescription) - writeFile(f"{imageDir}/novelwriter.appdata.xml", appdataXML) + appDescription = (SETUP_DIR / "description_short.txt").read_text() + appdataXML = (SETUP_DIR / "novelwriter.appdata.xml").read_text() + appdataXML = appdataXML.format(description=appDescription) + (imgDir / "novelwriter.appdata.xml").write_text(appdataXML) print("Wrote: novelwriter.appdata.xml") - writeFile(f"{imageDir}/entrypoint.sh", ( + (imgDir / "entrypoint.sh").write_text( '#! /bin/bash \n' '{{ python-executable }} -sE ${APPDIR}/opt/python{{ python-version }}/bin/novelwriter "$@"' - )) + ) print("Wrote: entrypoint.sh") - writeFile(f"{imageDir}/requirements.txt", os.path.abspath(outDir)) + (imgDir / "requirements.txt").write_text(str(outDir)) print("Wrote: requirements.txt") - shutil.copyfile("setup/data/novelwriter.desktop", f"{imageDir}/novelwriter.desktop") + shutil.copyfile(SETUP_DIR / "data" / "novelwriter.desktop", imgDir / "novelwriter.desktop") print("Copied: novelwriter.desktop") - shutil.copyfile("setup/icons/novelwriter.svg", f"{imageDir}/novelwriter.svg") + shutil.copyfile(SETUP_DIR / "icons" / "novelwriter.svg", imgDir / "novelwriter.svg") print("Copied: novelwriter.svg") shutil.copyfile( - "setup/data/hicolor/256x256/apps/novelwriter.png", f"{imageDir}/novelwriter.png" + SETUP_DIR / "data" / "hicolor" / "256x256" / "apps" / "novelwriter.png", + imgDir / "novelwriter.png" ) print("Copied: novelwriter.png") @@ -1081,15 +1014,15 @@ def makeAppImage(sysArgs: list[str]) -> list[str]: print("") sys.exit(1) - bldFile = glob.glob(f"{bldDir}/*.AppImage")[0] - outFile = f"{bldDir}/novelWriter-{pkgVers}.AppImage" - os.rename(bldFile, outFile) - shaFile = makeCheckSum(os.path.basename(outFile), cwd=bldDir) + bldFile = list(bldDir.glob("*.AppImage"))[0] + outFile = bldDir / f"novelWriter-{pkgVers}.AppImage" + bldFile.rename(outFile) + shaFile = makeCheckSum(outFile.name, cwd=bldDir) toUpload(outFile) toUpload(shaFile) - return unparsedArgs + return ## @@ -1690,6 +1623,27 @@ if __name__ == "__main__": cmdBuildUbuntu.add_argument("--first", action="store_true", help="Set build number to 0.") cmdBuildUbuntu.set_defaults(func=buildForLaunchpad) + # Build AppImage + cmdBuildAppImage = parsers.add_parser( + "build-appimage", help=( + "Build an AppImage. " + "Argument --linux-tag defaults manylinux_2_28_x86_64, and --python-version to 3.11." + ) + ) + cmdBuildAppImage.add_argument( + "--linux-tag", + default="manylinux_2_28_x86_64", + help=( + "Linux compatibility tag (e.g. manylinux_2_28_x86_64) " + "see https://python-appimage.readthedocs.io/en/latest/#available-python-appimages " + "and https://github.com/pypa/manylinux for a list of valid tags." + ), + ) + cmdBuildAppImage.add_argument( + "--python-version", default="3.11", help="Python version (e.g. 3.11)" + ) + cmdBuildAppImage.set_defaults(func=buildAppImage) + # if "gen-plist" in sysArgs: # sysArgs.remove("gen-plist") # genMacOSPlist() From d43a79938991454a34762c5015eec0c66ed47f77 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 4 Jul 2024 21:00:15 +0200 Subject: [PATCH 51/67] Updated Windows packaging code --- pkgutils.py | 265 ++++++++++++-------------------------- setup/win_setup_embed.iss | 2 +- 2 files changed, 85 insertions(+), 182 deletions(-) diff --git a/pkgutils.py b/pkgutils.py index 7735dca4..04ec3b5d 100755 --- a/pkgutils.py +++ b/pkgutils.py @@ -616,78 +616,6 @@ def copyPackageFiles(dst: Path, useCfg: bool = False) -> None: return -## -# Make Minimal Package (minimal-zip) -## - -def makeWindowsZip() -> None: - """Pack the core source file in a single zip file.""" - from zipfile import ZIP_DEFLATED, ZipFile - - print("") - print("Building Windows ZIP File") - print("=========================") - - bldDir = "dist_minimal" - if not os.path.isdir(bldDir): - os.mkdir(bldDir) - - if not checkAssetsExist(): - print("ERROR: Missing build assets") - sys.exit(1) - - pkgVers, _, _ = extractVersion() - zipFile = f"novelwriter-{pkgVers}-minimal-win.zip" - outFile = os.path.join(bldDir, zipFile) - if os.path.isfile(outFile): - os.unlink(outFile) - print("") - - rootFiles = [ - "README.md", - "LICENSE.md", - "CREDITS.md", - "CHANGELOG.md", - "requirements.txt", - "pkgutils.py", - "pyproject.toml", - ] - - with ZipFile(outFile, "w", compression=ZIP_DEFLATED, compresslevel=9) as zipObj: - - for nRoot, _, nFiles in os.walk("novelwriter"): - if nRoot.endswith("__pycache__"): - print("Skipped: %s" % nRoot) - continue - - print("Added: %s/* [Files: %d]" % (nRoot, len(nFiles))) - for aFile in nFiles: - if aFile.endswith(".pyc"): - print("Skipping File: %s" % aFile) - continue - zipObj.write(os.path.join(nRoot, aFile)) - - zipObj.write("novelWriter.py", "novelWriter.pyw") - print("Added: novelWriter.pyw") - - for aFile in rootFiles: - print("Added: %s" % aFile) - zipObj.write(aFile) - - zipObj.write(os.path.join("novelwriter", "assets", "manual.pdf"), "UserManual.pdf") - print("Added: UserManual.pdf") - - print("") - print("Created File: %s" % outFile) - - shaFile = makeCheckSum(zipFile, cwd=bldDir) - toUpload(outFile) - toUpload(shaFile) - print("") - - return - - ## # Make Debian Package ## @@ -961,6 +889,7 @@ def buildAppImage(args: argparse.Namespace) -> None: print("Copying novelWriter source ...") print("") + copySourceCode(outDir) print("") @@ -1029,7 +958,7 @@ def buildAppImage(args: argparse.Namespace) -> None: # Make Windows Setup EXE (build-win-exe) ## -def makeWindowsEmbedded(sysArgs: list[str]) -> None: +def makeWindowsEmbedded(args: argparse.Namespace) -> None: """Set up a package with embedded Python and dependencies for Windows installation. """ @@ -1042,18 +971,8 @@ def makeWindowsEmbedded(sysArgs: list[str]) -> None: print("================================") print("") - minimalZip = None - packVersion = "none" - if len(sysArgs) >= 2: - if os.path.isfile(sysArgs[1]): - minimalZip = sysArgs[1] - - if minimalZip is None: - print("Please provide the path to the minimal win package as an argument") - sys.exit(1) - - packVersion = os.path.basename(minimalZip).split("-")[1] - print("Version: %s" % packVersion) + numVers, hexVers, relDate = extractVersion() + print("Version: %s" % numVers) # Set Up Folder # ============= @@ -1061,27 +980,36 @@ def makeWindowsEmbedded(sysArgs: list[str]) -> None: if not os.path.isdir("dist"): os.mkdir("dist") - outDir = os.path.join("dist", "novelWriter") - libDir = os.path.join(outDir, "lib") - if os.path.isdir(outDir): + bldDir = CURR_DIR / "dist" + outDir = bldDir / "novelWriter" + libDir = outDir / "lib" + if outDir.exists: shutil.rmtree(outDir) - os.mkdir(outDir) - os.mkdir(libDir) + outDir.mkdir() + libDir.mkdir() - # Extract Source Files - # ==================== + # Copy novelWriter Source + # ======================= - print("Extracting source files ...") - with zipfile.ZipFile(minimalZip, "r") as inFile: - inFile.extractall(outDir) + print("Copying and compiling novelWriter source ...") + print("") - shutil.copyfile( - os.path.join(outDir, "novelwriter", "assets", "icons", "novelwriter.ico"), - os.path.join(outDir, "novelwriter.ico") - ) + copySourceCode(outDir) - compileall.compile_dir(os.path.join(outDir, "novelwriter")) + files = [ + CURR_DIR / "CREDITS.md", + CURR_DIR / "LICENSE.md", + CURR_DIR / "requirements.txt", + SETUP_DIR / "icons" / "novelwriter.ico", + SETUP_DIR / "iss_license.txt", + + ] + for item in files: + shutil.copyfile(item, outDir) + print(f"Copied: {item} > {outDir / item.name}") + + compileall.compile_dir(outDir / "novelwriter") print("Done") print("") @@ -1106,28 +1034,16 @@ def makeWindowsEmbedded(sysArgs: list[str]) -> None: print("Done") print("") - # Sort Out Licence Files - # ====================== - - os.rename( - os.path.join(outDir, "LICENSE.txt"), - os.path.join(outDir, "PYTHON-LICENSE.txt") - ) - shutil.copyfile( - os.path.join("setup", "iss_license.txt"), - os.path.join(outDir, "LICENSES.txt") - ) - # Install Dependencies # ==================== print("Install dependencies ...") - sysCmd = [sys.executable] - sysCmd += "-m pip install -r requirements.txt --target".split() - sysCmd += [libDir] try: - subprocess.call(sysCmd) + subprocess.call([ + sys.executable, "-m", + "pip", "install", "-r", "requirements.txt", "--target", str(libDir) + ]) except Exception as exc: print("Failed with error:") print(str(exc)) @@ -1141,7 +1057,7 @@ def makeWindowsEmbedded(sysArgs: list[str]) -> None: print("Updating starting script ...") - writeFile(os.path.join(outDir, "novelWriter.pyw"), ( + (outDir / "novelWriter.pyw").write_text( "#!/usr/bin/env python3\n" "import os\n" "import sys\n" @@ -1152,7 +1068,7 @@ def makeWindowsEmbedded(sysArgs: list[str]) -> None: "if __name__ == \"__main__\":\n" " import novelwriter\n" " novelwriter.main(sys.argv[1:])\n" - )) + ) print("Done") print("") @@ -1160,35 +1076,35 @@ def makeWindowsEmbedded(sysArgs: list[str]) -> None: # Clean Up Files # ============== - def unlinkIfFound(delFile: str) -> None: - if os.path.isfile(delFile): - os.unlink(delFile) - print("Deleted: %s" % delFile) + def unlinkIfFound(file: Path) -> None: + if file.is_file(): + file.unlink() + print(f"Deleted: {file}") - def deleteFolder(delPath: str) -> None: - if os.path.isdir(delPath): - shutil.rmtree(delPath) - print("Deleted: %s" % delPath) + def deleteFolder(folder: Path) -> None: + if folder.is_dir(): + shutil.rmtree(folder) + print(f"Deleted: {folder}") print("Deleting Redundant Files") print("========================") print("") - pyQt5Dir = os.path.join(libDir, "PyQt5") - bindDir = os.path.join(pyQt5Dir, "bindings") - qt5Dir = os.path.join(pyQt5Dir, "Qt5") - binDir = os.path.join(qt5Dir, "bin") - plugDir = os.path.join(qt5Dir, "plugins") - qmDir = os.path.join(qt5Dir, "translations") - dictDir = os.path.join(libDir, "enchant", "data", "mingw64", "share", "enchant", "hunspell") + pyQt5Dir = libDir / "PyQt5" + bindDir = pyQt5Dir / "bindings" + qt5Dir = pyQt5Dir / "Qt5" + binDir = qt5Dir / "bin" + plugDir = qt5Dir / "plugins" + qmDir = qt5Dir / "translations" + dictDir = libDir / "enchant" / "data" / "mingw64" / "share" / "enchant" / "hunspell" - for dictFile in os.listdir(dictDir): - if not dictFile.startswith(("en_GB", "en_US")): - unlinkIfFound(os.path.join(dictDir, dictFile)) + for item in dictDir.iterdir(): + if not item.name.startswith(("en_GB", "en_US")): + unlinkIfFound(item) - for qmFile in os.listdir(qmDir): - if not qmFile.startswith("qtbase"): - unlinkIfFound(os.path.join(qmDir, qmFile)) + for item in qmDir.iterdir(): + if not item.name.startswith("qtbase"): + unlinkIfFound(item) delQt5 = [ "Qt5Bluetooth", "Qt5DBus", "Qt5Designer", "Qt5Designer", "Qt5Help", "Qt5Location", @@ -1200,30 +1116,28 @@ def makeWindowsEmbedded(sysArgs: list[str]) -> None: "Qt5SerialPort", "Qt5Sql", "Qt5Test", "Qt5TextToSpeech", "Qt5WebChannel", "Qt5WebSockets", "Qt5WebView", "Qt5Xml", "Qt5XmlPatterns" ] - for qt5Item in delQt5: - qtItem = qt5Item.replace("Qt5", "Qt") - unlinkIfFound(os.path.join(binDir, qt5Item+".dll")) - unlinkIfFound(os.path.join(pyQt5Dir, qtItem+".pyd")) - unlinkIfFound(os.path.join(pyQt5Dir, qtItem+".pyi")) - deleteFolder(os.path.join(bindDir, qtItem)) + for item in delQt5: + qtItem = item.replace("Qt5", "Qt") + unlinkIfFound(binDir / f"{item}.dll") + unlinkIfFound(pyQt5Dir / f"{qtItem}.pyd") + unlinkIfFound(pyQt5Dir / f"{qtItem}.pyi") + deleteFolder(bindDir / qtItem) delList = [ - os.path.join(binDir, "opengl32sw.dll"), - os.path.join(qt5Dir, "qml"), - os.path.join(plugDir, "geoservices"), - os.path.join(plugDir, "playlistformats"), - os.path.join(plugDir, "renderers"), - os.path.join(plugDir, "sensorgestures"), - os.path.join(plugDir, "sensors"), - os.path.join(plugDir, "sqldrivers"), - os.path.join(plugDir, "texttospeech"), - os.path.join(plugDir, "webview"), + binDir / "opengl32sw.dll", + qt5Dir / "qml", + plugDir / "geoservices", + plugDir / "playlistformats", + plugDir / "renderers", + plugDir / "sensorgestures", + plugDir / "sensors", + plugDir / "sqldrivers", + plugDir / "texttospeech", + plugDir / "webview", ] - for delItem in delList: - if os.path.isfile(delItem): - unlinkIfFound(delItem) - elif os.path.isdir(delItem): - deleteFolder(delItem) + for item in delList: + unlinkIfFound(item) + deleteFolder(item) print("Done") print("") @@ -1233,10 +1147,10 @@ def makeWindowsEmbedded(sysArgs: list[str]) -> None: print("") # Read the iss template - issData = readFile(os.path.join("setup", "win_setup_embed.iss")) - issData = issData.replace(r"%%version%%", packVersion) - issData = issData.replace(r"%%dir%%", os.getcwd()) - writeFile("setup.iss", issData) + issData = (SETUP_DIR / "win_setup_embed.iss").read_text() + issData = issData.replace(r"%%version%%", numVers) + issData = issData.replace(r"%%dist%%", str(bldDir)) + (CURR_DIR / "setup.iss").write_text(issData) print("") try: @@ -1644,27 +1558,16 @@ if __name__ == "__main__": ) cmdBuildAppImage.set_defaults(func=buildAppImage) + # Build Windows Inno Setup Installer + cmdBuildSetupExe = parsers.add_parser( + "build-win-exe", help="Build a setup.exe file with Python embedded for Windows." + ) + cmdBuildSetupExe.set_defaults(func=makeWindowsEmbedded) + # if "gen-plist" in sysArgs: # sysArgs.remove("gen-plist") # genMacOSPlist() - # if "windows-zip" in sysArgs: - # sysArgs.remove("windows-zip") - # makeWindowsZip() - - # if "build-win-exe" in sysArgs: - # sysArgs.remove("build-win-exe") - # makeWindowsEmbedded(sysArgs) - # sys.exit(0) # Don't continue execution - - # if "build-appimage" in sysArgs: - # sysArgs.remove("build-appimage") - # if hostOS == OS_LINUX: - # sysArgs = makeAppImage(sysArgs) - # else: - # print("ERROR: Command 'build-appimage' can only be used on Linux") - # sys.exit(1) - # # General Installers # # ================== diff --git a/setup/win_setup_embed.iss b/setup/win_setup_embed.iss index dc856f69..042914fc 100644 --- a/setup/win_setup_embed.iss +++ b/setup/win_setup_embed.iss @@ -1,6 +1,6 @@ ; Script for building setup.exe installer with Inno Setup -#define nwAppDir "%%dir%%\dist" +#define nwAppDir "%%dist%%" #define nwAppName "novelWriter" #define nwAppVersion "%%version%%" #define nwAppPublisher "novelWriter" From 43eb62576c501c631e6b42de29cc5986fbf05a3f Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 4 Jul 2024 21:16:49 +0200 Subject: [PATCH 52/67] Fix Windows installer and update MacOS PList generator --- pkgutils.py | 66 +++++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/pkgutils.py b/pkgutils.py index 04ec3b5d..94a83a5c 100755 --- a/pkgutils.py +++ b/pkgutils.py @@ -520,33 +520,6 @@ def buildAllAssets(args: argparse.Namespace) -> None: return -## -# Generate MacOS PList -## - -def genMacOSPlist() -> None: - """Set necessary values for .plist file for MacOS build.""" - outDir = "setup/macos" - numVers = stripVersion(extractVersion()[0]) - copyrightYear = datetime.datetime.now().year - - # These keys are no longer used but are present for compatibility - pkgVersMaj, pkgVersMin = numVers.split(".")[:2] - - plistXML = readFile(f"{outDir}/Info.plist.template").format( - macosBundleSVers=numVers, - macosBundleVers=numVers, - macosBundleVersMajor=pkgVersMaj, - macosBundleVersMinor=pkgVersMin, - macosBundleCopyright=f"Copyright 2018–{copyrightYear}, Veronica Berglyd Olsen", - ) - - print(f"Writing Info.plist to {outDir}/Info.plist") - writeFile(f"{outDir}/Info.plist", plistXML) - - return - - # =============================================================================================== # # Python Packaging # =============================================================================================== # @@ -971,7 +944,7 @@ def makeWindowsEmbedded(args: argparse.Namespace) -> None: print("================================") print("") - numVers, hexVers, relDate = extractVersion() + numVers, _, _ = extractVersion() print("Version: %s" % numVers) # Set Up Folder @@ -1006,7 +979,7 @@ def makeWindowsEmbedded(args: argparse.Namespace) -> None: ] for item in files: - shutil.copyfile(item, outDir) + shutil.copyfile(item, outDir / item.name) print(f"Copied: {item} > {outDir / item.name}") compileall.compile_dir(outDir / "novelwriter") @@ -1167,6 +1140,33 @@ def makeWindowsEmbedded(args: argparse.Namespace) -> None: return +## +# Generate MacOS PList +## + +def genMacOSPlist(args: argparse.Namespace) -> None: + """Set necessary values for .plist file for MacOS build.""" + outDir = SETUP_DIR / "macos" + numVers = stripVersion(extractVersion()[0]) + copyrightYear = datetime.datetime.now().year + + # These keys are no longer used but are present for compatibility + pkgVersMaj, pkgVersMin = numVers.split(".")[:2] + + plistXML = (outDir / "Info.plist.template").read_text().format( + macosBundleSVers=numVers, + macosBundleVers=numVers, + macosBundleVersMajor=pkgVersMaj, + macosBundleVersMinor=pkgVersMin, + macosBundleCopyright=f"Copyright 2018–{copyrightYear}, Veronica Berglyd Olsen", + ) + + print(f"Writing Info.plist to {outDir}/Info.plist") + (outDir / "Info.plist").write_text(plistXML) + + return + + # =============================================================================================== # # General Installers # =============================================================================================== # @@ -1564,9 +1564,11 @@ if __name__ == "__main__": ) cmdBuildSetupExe.set_defaults(func=makeWindowsEmbedded) - # if "gen-plist" in sysArgs: - # sysArgs.remove("gen-plist") - # genMacOSPlist() + # Generate MacOS PList File + cmdBuildMacOSPlist = parsers.add_parser( + "gen-plist", help="Generate an Info.plist for use in a MacOS Bundle." + ) + cmdBuildMacOSPlist.set_defaults(func=genMacOSPlist) # # General Installers # # ================== From 1c0fdd6a17e0ba35f162f690c08e7d2d1c1ae580 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 4 Jul 2024 21:38:31 +0200 Subject: [PATCH 53/67] Update XDG tools, clean up and fix a deb build issue --- pkgutils.py | 155 ++++++++++++++++++---------------------------------- 1 file changed, 54 insertions(+), 101 deletions(-) diff --git a/pkgutils.py b/pkgutils.py index 94a83a5c..3a38221e 100755 --- a/pkgutils.py +++ b/pkgutils.py @@ -28,7 +28,6 @@ from __future__ import annotations import argparse import datetime import email.utils -import os import shutil import subprocess import sys @@ -113,22 +112,22 @@ def toUpload(srcPath: str | Path, dstName: str | None = None) -> None: return -def makeCheckSum(sumFile: str, cwd: Path | str | None = None) -> str: +def makeCheckSum(sumFile: str, cwd: Path | None = None) -> str: """Create a SHA256 checksum file.""" try: if cwd is None: - shaFile = sumFile+".sha256" + shaFile = f"{sumFile}.sha256" else: - shaFile = os.path.join(cwd, sumFile+".sha256") + shaFile = cwd / f"{sumFile}.sha256" with open(shaFile, mode="w") as fOut: subprocess.call(["shasum", "-a", "256", sumFile], stdout=fOut, cwd=cwd) - print("SHA256 Sum: %s" % shaFile) + print(f"SHA256 Sum: {shaFile}") except Exception as exc: print("Could not generate sha256 file") print(str(exc)) return "" - return shaFile + return str(shaFile) def checkAssetsExist() -> bool: @@ -137,22 +136,20 @@ def checkAssetsExist() -> bool: hasManual = False hasQmData = False - sampleZip = os.path.join("novelwriter", "assets", "sample.zip") - if os.path.isfile(sampleZip): + sampleZip = CURR_DIR / "novelwriter" / "assets" / "sample.zip" + if sampleZip.is_file(): print(f"Found: {sampleZip}") hasSample = True - pdfManual = os.path.join("novelwriter", "assets", "manual.pdf") - if os.path.isfile(pdfManual): + pdfManual = CURR_DIR / "novelwriter" / "assets" / "manual.pdf" + if pdfManual.is_file(): print(f"Found: {pdfManual}") hasManual = True - i18nAssets = os.path.join("novelwriter", "assets", "i18n") - for i18nItem in os.listdir(i18nAssets): - i18nPath = os.path.join(i18nAssets, i18nItem) - if os.path.isfile(i18nPath) and i18nPath.endswith(".qm"): - print(f"Found: {i18nPath}") - hasQmData = True + i18nAssets = CURR_DIR / "novelwriter" / "assets" / "i18n" + if len(list(i18nAssets.glob("*.qm"))) > 0: + print(f"Found: {i18nAssets}/*.qm") + hasQmData = True return hasSample and hasManual and hasQmData @@ -283,7 +280,7 @@ def buildPdfManual(args: argparse.Namespace | None = None) -> None: print("") sys.exit(1) - if not os.path.isfile(finalFile): + if not finalFile.is_file(): print("No output file was found!") print("") sys.exit(1) @@ -551,7 +548,7 @@ def copySourceCode(dst: Path) -> None: # Copy Package Files ## -def copyPackageFiles(dst: Path, useCfg: bool = False) -> None: +def copyPackageFiles(dst: Path, setupPy: bool = False, useCfg: bool = False) -> None: """Copy files needed for packaging.""" copyFiles = ["LICENSE.md", "CREDITS.md", "pyproject.toml"] @@ -562,11 +559,17 @@ def copyPackageFiles(dst: Path, useCfg: bool = False) -> None: (dst / "MANIFEST.in").write_text( "include LICENSE.md\n" "include CREDITS.md\n" - # "include data/*\n" "recursive-include novelwriter/assets *\n" ) print("Wrote: MANIFEST.in") + if setupPy: + (dst / "setup.py").write_text( + "import setuptools\n" + "setuptools.setup()\n" + ) + print("Wrote: setup.py") + if useCfg: # This is needed for Ubuntu up to 22.04 text = (SETUP_DIR / "launchpad_setup.cfg").read_text() @@ -655,7 +658,7 @@ def makeDebianPackage( print("Copying or generating additional files ...") print("") - copyPackageFiles(outDir, oldSetuptools) + copyPackageFiles(outDir, setupPy=True, useCfg=oldSetuptools) # Copy/Write Debian Files # ======================= @@ -950,15 +953,13 @@ def makeWindowsEmbedded(args: argparse.Namespace) -> None: # Set Up Folder # ============= - if not os.path.isdir("dist"): - os.mkdir("dist") - bldDir = CURR_DIR / "dist" outDir = bldDir / "novelWriter" libDir = outDir / "lib" if outDir.exists: shutil.rmtree(outDir) + bldDir.mkdir(exist_ok=True) outDir.mkdir() libDir.mkdir() @@ -993,9 +994,9 @@ def makeWindowsEmbedded(args: argparse.Namespace) -> None: print("Adding Python embeddable ...") pyVers = "%d.%d.%d" % (sys.version_info[:3]) - zipFile = "python-%s-embed-amd64.zip" % pyVers - pyZip = os.path.join("dist", zipFile) - if not os.path.isfile(pyZip): + zipFile = f"python-{pyVers}-embed-amd64.zip" + pyZip = bldDir / zipFile + if not pyZip.is_file(): pyUrl = f"https://www.python.org/ftp/python/{pyVers}/{zipFile}" print("Downloading: %s" % pyUrl) urllib.request.urlretrieve(pyUrl, pyZip) @@ -1175,7 +1176,7 @@ def genMacOSPlist(args: argparse.Namespace) -> None: # XDG Installation (xdg-install) ## -def xdgInstall() -> None: +def xdgInstall(args: argparse.Namespace) -> None: """Will attempt to install icons and make a launcher.""" print("") print("XDG Install") @@ -1195,9 +1196,9 @@ def xdgInstall() -> None: if testExec is not None: exOpts.append(testExec) - testExec = os.path.join(os.getcwd(), "novelWriter.py") - if os.path.isfile(testExec): - exOpts.append(testExec) + testExec = CURR_DIR / "novelWriter.py" + if testExec.is_file(): + exOpts.append(str(testExec)) useExec = "" nOpts = len(exOpts) @@ -1228,9 +1229,10 @@ def xdgInstall() -> None: # =========================== # Generate launcher - desktopData = readFile(os.path.join("setup", "data", "novelwriter.desktop")) + desktopFile = CURR_DIR / "novelwriter.desktop" + desktopData = (SETUP_DIR / "data" / "novelwriter.desktop").read_text() desktopData = desktopData.replace("Exec=novelwriter", f"Exec={useExec}") - writeFile("novelwriter.desktop", desktopData) + desktopFile.write_text(desktopData) # Remove old desktop icon exCode = subprocess.call( @@ -1297,8 +1299,7 @@ def xdgInstall() -> None: print(f"Error {exCode}: Could not update icon cache") # Clean up - if os.path.isfile("./novelwriter.desktop"): - os.unlink("./novelwriter.desktop") + desktopFile.unlink(missing_ok=True) print("") print("Done!") @@ -1311,7 +1312,7 @@ def xdgInstall() -> None: # XDG Uninstallation (xdg-uninstall) ## -def xdgUninstall() -> None: +def xdgUninstall(args: argparse.Namespace) -> None: """Will attempt to uninstall icons and the launcher.""" print("") print("XDG Uninstall") @@ -1386,56 +1387,6 @@ if __name__ == "__main__": parser = argparse.ArgumentParser() parsers = parser.add_subparsers() - helpMsg = [ - "", - "novelWriter Setup Tool", - "======================", - "", - "This tool provides setup and build commands for installing or distibuting", - "novelWriter as a package on Linux, Mac and Windows. The available options", - "are as follows:", - "", - "General:", - "", - " help Print the help message.", - " pip Install all package dependencies for novelWriter using pip.", - " version Print the novelWriter version.", - " build-clean Will attempt to delete 'build' and 'dist' folders.", - "", - "Additional Builds:", - "", - " manual Build the help documentation as PDF (requires LaTeX).", - " sample Build the sample project zip file and add it to assets.", - " qtlupdate Update translation files for internationalisation.", - " The files to be updated must be provided as arguments.", - " qtlrelease Build the language files for internationalisation.", - " clean-assets Delete assets built by manual, sample and qtlrelease.", - " gen-plist Generates an Info.plist for use in a MacOS Bundle", - "", - "Python Packaging:", - "", - " import-i18n Import updated i18n files from a zip file.", - " windows-zip Creates a minimal zip file of the core application without", - " all the other source files. Used for Windows builds.", - " build-deb Build a .deb package for Debian and Ubuntu. Add --sign to ", - " sign package.", - " build-ubuntu Build a .deb packages Launchpad. Add --sign to ", - " sign package. Add --first to set build number to 0.", - " build-win-exe Build a setup.exe file with Python embedded for Windows.", - " The package must be built from a minimal windows zip file.", - " build-appimage Build an AppImage. Argument --linux-tag defaults to", - " manylinux_2_28_x86_64, and --python-version to 3.11.", - "", - "System Install:", - "", - " xdg-install Install launcher and icons for freedesktop systems. Run as", - " root or with sudo for system-wide install, or as user for", - " single user install.", - " xdg-uninstall Remove the launcher and icons for the current system as", - " installed by the 'xdg-install' command.", - "", - ] - # Version cmdVersion = parsers.add_parser( "version", help="Print the novelWriter version." @@ -1570,24 +1521,26 @@ if __name__ == "__main__": ) cmdBuildMacOSPlist.set_defaults(func=genMacOSPlist) - # # General Installers - # # ================== + # General Installers + # ================== - # if "xdg-install" in sysArgs: - # sysArgs.remove("xdg-install") - # if hostOS == OS_WIN: - # print("ERROR: Command 'xdg-install' cannot be used on Windows") - # sys.exit(1) - # else: - # xdgInstall() + # Linux XDG Install + cmdXDGInstall = parsers.add_parser( + "xdg-install", help=( + "Install launcher and icons for freedesktop systems. Run as root or with sudo for " + "system-wide install, or as user for single user install." + ) + ) + cmdXDGInstall.set_defaults(func=xdgInstall) - # if "xdg-uninstall" in sysArgs: - # sysArgs.remove("xdg-uninstall") - # if hostOS == OS_WIN: - # print("ERROR: Command 'xdg-uninstall' cannot be used on Windows") - # sys.exit(1) - # else: - # xdgUninstall() + # Linux XDG Uninstall + cmdXDGUninstall = parsers.add_parser( + "xdg-uninstall", help=( + "Remove the launcher and icons for the current system " + "as installed by the 'xdg-install' command." + ) + ) + cmdXDGUninstall.set_defaults(func=xdgUninstall) args = parser.parse_args() args.func(args) From eba0fa58bfa7fc5245e9c2222dcd595c41c554d1 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 4 Jul 2024 21:40:48 +0200 Subject: [PATCH 54/67] Update Windows build job --- .github/workflows/build_win.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml index c16e5340..086b7103 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build_win.yml @@ -15,5 +15,23 @@ jobs: with: python-version: "3.12" architecture: x64 + - name: Checkout Source uses: actions/checkout@v4 + + - name: Download Artifacts + uses: actions/download-artifact@v4 + with: + name: nw-assets + path: novelwriter/assets + + - name: Build Setup Installer + run: python pkgutils.py build-win-exe + + - name: Upload Artifacts + uses: actions/upload-artifact@v4 + with: + name: Win-Setup + path: dist/*.exe + if-no-files-found: error + retention-days: 14 From e40e282837df383ccc86dd4ed4ff4cff2235bede Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 4 Jul 2024 21:44:28 +0200 Subject: [PATCH 55/67] Fix bug in Windows build script --- pkgutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgutils.py b/pkgutils.py index 3a38221e..cd8cf0a9 100755 --- a/pkgutils.py +++ b/pkgutils.py @@ -956,7 +956,7 @@ def makeWindowsEmbedded(args: argparse.Namespace) -> None: bldDir = CURR_DIR / "dist" outDir = bldDir / "novelWriter" libDir = outDir / "lib" - if outDir.exists: + if outDir.exists(): shutil.rmtree(outDir) bldDir.mkdir(exist_ok=True) From cc97129e6433103ba560b3b8710539494fe93d6b Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 4 Jul 2024 22:01:52 +0200 Subject: [PATCH 56/67] Add description to pkgutils help --- pkgutils.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgutils.py b/pkgutils.py index cd8cf0a9..69058254 100755 --- a/pkgutils.py +++ b/pkgutils.py @@ -1384,7 +1384,14 @@ def xdgUninstall(args: argparse.Namespace) -> None: if __name__ == "__main__": """Parse command line options and run the commands.""" - parser = argparse.ArgumentParser() + parser = argparse.ArgumentParser( + usage="pkgutils.py [command] [--flags]", + description=( + "This tool provides setup and build commands for installing or distibuting " + "novelWriter as a package on Linux, Mac and Windows, as well as developer tools " + "for internationalisation." + ) + ) parsers = parser.add_subparsers() # Version From 47b8e12bc7de6167d8f4f21877318d25371a9dfe Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 4 Jul 2024 22:07:33 +0200 Subject: [PATCH 57/67] Fix a few workflow issues --- .github/workflows/build_assets.yml | 4 +--- .github/workflows/test_linux.yml | 2 +- setup/make_release.sh | 6 ------ 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build_assets.yml b/.github/workflows/build_assets.yml index 05579f59..2889ae5d 100644 --- a/.github/workflows/build_assets.yml +++ b/.github/workflows/build_assets.yml @@ -25,9 +25,7 @@ jobs: - name: Build Assets run: | - python pkgutils.py manual - python pkgutils.py sample - python pkgutils.py qtlrelease + python pkgutils.py build-assets - name: Upload Artifacts uses: actions/upload-artifact@v4 diff --git a/.github/workflows/test_linux.yml b/.github/workflows/test_linux.yml index 897d1c0e..955b798a 100644 --- a/.github/workflows/test_linux.yml +++ b/.github/workflows/test_linux.yml @@ -33,7 +33,7 @@ jobs: run: | pip install -U -r requirements.txt -r tests/requirements.txt - name: Run Build Commands - run: python pkgutils.py qtlrelease sample + run: python pkgutils.py build-assets - name: Run Tests run: | export QT_QPA_PLATFORM=offscreen diff --git a/setup/make_release.sh b/setup/make_release.sh index c5237745..d88340a7 100755 --- a/setup/make_release.sh +++ b/setup/make_release.sh @@ -20,12 +20,6 @@ pip3 install -r docs/source/requirements.txt python3 pkgutils.py build-assets deactivate -echo "" -echo " Building Windows Source Zip" -echo "================================================================================" -echo "" -python3 pkgutils.py windows-zip - echo "" echo " Building Linux Packages" echo "================================================================================" From 5f3f55133e8b2eb90f44b10097c83b65251f8852 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 4 Jul 2024 22:08:28 +0200 Subject: [PATCH 58/67] Remove manual build from linux tests --- .github/workflows/test_linux.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_linux.yml b/.github/workflows/test_linux.yml index 955b798a..5ff6cab5 100644 --- a/.github/workflows/test_linux.yml +++ b/.github/workflows/test_linux.yml @@ -33,7 +33,9 @@ jobs: run: | pip install -U -r requirements.txt -r tests/requirements.txt - name: Run Build Commands - run: python pkgutils.py build-assets + run: | + python pkgutils.py qtlrelease + python pkgutils.py sample - name: Run Tests run: | export QT_QPA_PLATFORM=offscreen From 188bc5d16f329fc2f14127a099868cea3c1bf22d Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 4 Jul 2024 22:22:41 +0200 Subject: [PATCH 59/67] Restore usage of wrapper functions for read and write in pkgutils --- pkgutils.py | 65 ++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/pkgutils.py b/pkgutils.py index 69058254..052a7f98 100755 --- a/pkgutils.py +++ b/pkgutils.py @@ -90,15 +90,14 @@ def stripVersion(version: str) -> str: return version -def readFile(fileName: str) -> str: +def readFile(file: Path) -> str: """Read an entire file and return as a string.""" - return Path(fileName).read_text(encoding="utf-8") + return file.read_text(encoding="utf-8") -def writeFile(fileName: str, text: str) -> None: +def writeFile(file: Path, text: str) -> int: """Write string to file.""" - Path(fileName).write_text(text, encoding="utf-8") - return + return file.write_text(text, encoding="utf-8") def toUpload(srcPath: str | Path, dstName: str | None = None) -> None: @@ -404,11 +403,11 @@ def updateTranslationSources(args: argparse.Namespace) -> None: continue else: # Create an empty new language file langCode = item.name[3:-3] - item.write_text( + writeFile(item, ( "\n" "\n" f"\n" - ) + )) translations.append(item) print(f"Created: {item}") @@ -556,37 +555,37 @@ def copyPackageFiles(dst: Path, setupPy: bool = False, useCfg: bool = False) -> shutil.copyfile(copyFile, dst / copyFile) print("Copied: %s" % copyFile) - (dst / "MANIFEST.in").write_text( + writeFile(dst / "MANIFEST.in", ( "include LICENSE.md\n" "include CREDITS.md\n" "recursive-include novelwriter/assets *\n" - ) + )) print("Wrote: MANIFEST.in") if setupPy: - (dst / "setup.py").write_text( + writeFile(dst / "setup.py", ( "import setuptools\n" "setuptools.setup()\n" - ) + )) print("Wrote: setup.py") if useCfg: # This is needed for Ubuntu up to 22.04 - text = (SETUP_DIR / "launchpad_setup.cfg").read_text() + text = readFile(SETUP_DIR / "launchpad_setup.cfg") text = text.replace("setup/description_pypi.md", "data/description_short.txt") - (dst / "setup.cfg").write_text(text) + writeFile(dst / "setup.cfg", text) print("Wrote: setup.cfg") - (dst / "pyproject.toml").write_text( + writeFile(dst / "pyproject.toml", ( "[build-system]\n" "requires = [\"setuptools\"]\n" "build-backend = \"setuptools.build_meta\"\n" - ) + )) print("Wrote: pyproject.toml") else: - text = (CURR_DIR / "pyproject.toml").read_text() + text = readFile(CURR_DIR / "pyproject.toml") text = text.replace("setup/description_pypi.md", "data/description_short.txt") - (dst / "pyproject.toml").write_text(text) + writeFile(dst / "pyproject.toml", text) print("Wrote: pyproject.toml") return @@ -666,11 +665,11 @@ def makeDebianPackage( shutil.copytree(SETUP_DIR / "debian", debDir) print("Copied: debian/*") - (debDir / "changelog").write_text( + writeFile(debDir / "changelog", ( f"novelwriter ({pkgVers}) {distName}; urgency=low\n\n" f" * Update to version {pkgVers}\n\n" f" -- Veronica Berglyd Olsen {pkgDate}\n" - ) + )) print("Wrote: debian/changelog") # Copy/Write Data Files @@ -877,19 +876,19 @@ def buildAppImage(args: argparse.Namespace) -> None: # Write Metadata # ============== - appDescription = (SETUP_DIR / "description_short.txt").read_text() - appdataXML = (SETUP_DIR / "novelwriter.appdata.xml").read_text() + appDescription = readFile(SETUP_DIR / "description_short.txt") + appdataXML = readFile(SETUP_DIR / "novelwriter.appdata.xml") appdataXML = appdataXML.format(description=appDescription) - (imgDir / "novelwriter.appdata.xml").write_text(appdataXML) + writeFile(imgDir / "novelwriter.appdata.xml", appdataXML) print("Wrote: novelwriter.appdata.xml") - (imgDir / "entrypoint.sh").write_text( + writeFile(imgDir / "entrypoint.sh", ( '#! /bin/bash \n' '{{ python-executable }} -sE ${APPDIR}/opt/python{{ python-version }}/bin/novelwriter "$@"' - ) + )) print("Wrote: entrypoint.sh") - (imgDir / "requirements.txt").write_text(str(outDir)) + writeFile(imgDir / "requirements.txt", str(outDir)) print("Wrote: requirements.txt") shutil.copyfile(SETUP_DIR / "data" / "novelwriter.desktop", imgDir / "novelwriter.desktop") @@ -1031,7 +1030,7 @@ def makeWindowsEmbedded(args: argparse.Namespace) -> None: print("Updating starting script ...") - (outDir / "novelWriter.pyw").write_text( + writeFile(outDir / "novelWriter.pyw", ( "#!/usr/bin/env python3\n" "import os\n" "import sys\n" @@ -1042,7 +1041,7 @@ def makeWindowsEmbedded(args: argparse.Namespace) -> None: "if __name__ == \"__main__\":\n" " import novelwriter\n" " novelwriter.main(sys.argv[1:])\n" - ) + )) print("Done") print("") @@ -1121,10 +1120,10 @@ def makeWindowsEmbedded(args: argparse.Namespace) -> None: print("") # Read the iss template - issData = (SETUP_DIR / "win_setup_embed.iss").read_text() + issData = readFile(SETUP_DIR / "win_setup_embed.iss") issData = issData.replace(r"%%version%%", numVers) issData = issData.replace(r"%%dist%%", str(bldDir)) - (CURR_DIR / "setup.iss").write_text(issData) + writeFile(CURR_DIR / "setup.iss", issData) print("") try: @@ -1154,7 +1153,7 @@ def genMacOSPlist(args: argparse.Namespace) -> None: # These keys are no longer used but are present for compatibility pkgVersMaj, pkgVersMin = numVers.split(".")[:2] - plistXML = (outDir / "Info.plist.template").read_text().format( + plistXML = readFile(outDir / "Info.plist.template").format( macosBundleSVers=numVers, macosBundleVers=numVers, macosBundleVersMajor=pkgVersMaj, @@ -1163,7 +1162,7 @@ def genMacOSPlist(args: argparse.Namespace) -> None: ) print(f"Writing Info.plist to {outDir}/Info.plist") - (outDir / "Info.plist").write_text(plistXML) + writeFile(outDir / "Info.plist", plistXML) return @@ -1230,9 +1229,9 @@ def xdgInstall(args: argparse.Namespace) -> None: # Generate launcher desktopFile = CURR_DIR / "novelwriter.desktop" - desktopData = (SETUP_DIR / "data" / "novelwriter.desktop").read_text() + desktopData = readFile(SETUP_DIR / "data" / "novelwriter.desktop") desktopData = desktopData.replace("Exec=novelwriter", f"Exec={useExec}") - desktopFile.write_text(desktopData) + writeFile(desktopFile, desktopData) # Remove old desktop icon exCode = subprocess.call( From bc33a4d0d4bb8f119bddc7acffee94da15a2cc62 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 4 Jul 2024 22:24:33 +0200 Subject: [PATCH 60/67] Move build-clean to after the build commands in pkgutils --- pkgutils.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgutils.py b/pkgutils.py index 052a7f98..ba1fa98e 100755 --- a/pkgutils.py +++ b/pkgutils.py @@ -1411,18 +1411,12 @@ if __name__ == "__main__": cmdPipInstall.add_argument("--win", action="store_true", help="For Windows.", default=OS_WIN) cmdPipInstall.set_defaults(func=installPackages) - # Build Clean - cmdBuildClean = parsers.add_parser( - "build-clean", help="Recursively delete all build folders." - ) - cmdBuildClean.set_defaults(func=cleanBuildDirs) - # Additional Builds # ================= # Import Translations cmdImportTS = parsers.add_parser( - "qtlimport", help="Import updated i18n files from a zip file." + "qtlimport", help="Import updated i18n files from a Crowdin zip file." ) cmdImportTS.add_argument("file", help="Path to zip file from Crowdin") cmdImportTS.set_defaults(func=importI18nUpdates) @@ -1521,6 +1515,12 @@ if __name__ == "__main__": ) cmdBuildSetupExe.set_defaults(func=makeWindowsEmbedded) + # Build Clean + cmdBuildClean = parsers.add_parser( + "build-clean", help="Recursively delete all build folders." + ) + cmdBuildClean.set_defaults(func=cleanBuildDirs) + # Generate MacOS PList File cmdBuildMacOSPlist = parsers.add_parser( "gen-plist", help="Generate an Info.plist for use in a MacOS Bundle." From 2e1c08cbfad226e361a31a485305b7a85910e058 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Fri, 5 Jul 2024 13:21:39 +0200 Subject: [PATCH 61/67] Fix em unit calculation in document preview (#1961) --- novelwriter/core/toqdoc.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/novelwriter/core/toqdoc.py b/novelwriter/core/toqdoc.py index 493c4898..482da1fd 100644 --- a/novelwriter/core/toqdoc.py +++ b/novelwriter/core/toqdoc.py @@ -26,7 +26,7 @@ from __future__ import annotations import logging from PyQt5.QtGui import ( - QColor, QFont, QFontMetrics, QTextBlockFormat, QTextCharFormat, + QColor, QFont, QFontMetricsF, QTextBlockFormat, QTextCharFormat, QTextCursor, QTextDocument ) @@ -99,8 +99,8 @@ class ToQTextDocument(Tokenizer): self._document.clear() self._document.setDefaultFont(self._textFont) - qMetric = QFontMetrics(self._textFont) - mScale = qMetric.height() + qMetric = QFontMetricsF(self._textFont) + mScale = qMetric.ascent() fPt = self._textFont.pointSizeF() # Scaled Sizes From abd503b5a24bd0e67362afb79929495b66576bd2 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Fri, 5 Jul 2024 14:51:12 +0200 Subject: [PATCH 62/67] Rename the em variable for clarity --- novelwriter/core/toqdoc.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/novelwriter/core/toqdoc.py b/novelwriter/core/toqdoc.py index 482da1fd..f8a092e6 100644 --- a/novelwriter/core/toqdoc.py +++ b/novelwriter/core/toqdoc.py @@ -100,18 +100,18 @@ class ToQTextDocument(Tokenizer): self._document.setDefaultFont(self._textFont) qMetric = QFontMetricsF(self._textFont) - mScale = qMetric.ascent() + mPx = qMetric.ascent() # 1 em in pixels fPt = self._textFont.pointSizeF() # Scaled Sizes # ============ self._mHead = { - self.T_TITLE: (mScale * self._marginTitle[0], mScale * self._marginTitle[1]), - self.T_HEAD1: (mScale * self._marginHead1[0], mScale * self._marginHead1[1]), - self.T_HEAD2: (mScale * self._marginHead2[0], mScale * self._marginHead2[1]), - self.T_HEAD3: (mScale * self._marginHead3[0], mScale * self._marginHead3[1]), - self.T_HEAD4: (mScale * self._marginHead4[0], mScale * self._marginHead4[1]), + self.T_TITLE: (mPx * self._marginTitle[0], mPx * self._marginTitle[1]), + self.T_HEAD1: (mPx * self._marginHead1[0], mPx * self._marginHead1[1]), + self.T_HEAD2: (mPx * self._marginHead2[0], mPx * self._marginHead2[1]), + self.T_HEAD3: (mPx * self._marginHead3[0], mPx * self._marginHead3[1]), + self.T_HEAD4: (mPx * self._marginHead4[0], mPx * self._marginHead4[1]), } self._sHead = { @@ -122,12 +122,12 @@ class ToQTextDocument(Tokenizer): self.T_HEAD4: nwHeaders.H_SIZES.get(4, 1.0) * fPt, } - self._mText = (mScale * self._marginText[0], mScale * self._marginText[1]) - self._mMeta = (mScale * self._marginMeta[0], mScale * self._marginMeta[1]) - self._mSep = (mScale * self._marginSep[0], mScale * self._marginSep[1]) + self._mText = (mPx * self._marginText[0], mPx * self._marginText[1]) + self._mMeta = (mPx * self._marginMeta[0], mPx * self._marginMeta[1]) + self._mSep = (mPx * self._marginSep[0], mPx * self._marginSep[1]) - self._mIndent = mScale * 2.0 - self._tIndent = mScale * self._firstWidth + self._mIndent = mPx * 2.0 + self._tIndent = mPx * self._firstWidth # Block Format # ============ From 446163c6de3ceea96dbd1bbaf8901d0e22b2dde6 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Fri, 5 Jul 2024 15:14:30 +0200 Subject: [PATCH 63/67] Add DPI scaling to status LEDs --- novelwriter/extensions/statusled.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/novelwriter/extensions/statusled.py b/novelwriter/extensions/statusled.py index 061c0373..d1641234 100644 --- a/novelwriter/extensions/statusled.py +++ b/novelwriter/extensions/statusled.py @@ -28,6 +28,7 @@ import logging from PyQt5.QtGui import QColor, QPainter, QPaintEvent from PyQt5.QtWidgets import QAbstractButton, QWidget +from novelwriter import CONFIG from novelwriter.enum import nwTrinary from novelwriter.types import QtBlack, QtPaintAnitAlias @@ -36,6 +37,10 @@ logger = logging.getLogger(__name__) class StatusLED(QAbstractButton): + __slots__ = ( + "_neutral", "_postitve", "_negative", "_color", "_state", "_bPx" + ) + def __init__(self, sW: int, sH: int, parent: QWidget | None = None) -> None: super().__init__(parent=parent) self._neutral = QtBlack @@ -43,6 +48,7 @@ class StatusLED(QAbstractButton): self._negative = QtBlack self._color = QtBlack self._state = nwTrinary.NEUTRAL + self._bPx = CONFIG.pxInt(1) self.setFixedWidth(sW) self.setFixedHeight(sH) return @@ -76,8 +82,12 @@ class StatusLED(QAbstractButton): """Draw the LED.""" painter = QPainter(self) painter.setRenderHint(QtPaintAnitAlias, True) - painter.setPen(self.palette().dark().color()) + painter.setPen(self.palette().mid().color()) painter.setBrush(self._color) painter.setOpacity(1.0) - painter.drawEllipse(1, 1, self.width() - 2, self.height() - 2) + painter.drawEllipse( + self._bPx, self._bPx, + self.width() - 2*self._bPx, + self.height() - 2*self._bPx + ) return From 08e6d320dfac7d021addf9f51b3b2190d90daa66 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Fri, 5 Jul 2024 15:16:58 +0200 Subject: [PATCH 64/67] Use text colour for LED border --- novelwriter/extensions/statusled.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/novelwriter/extensions/statusled.py b/novelwriter/extensions/statusled.py index d1641234..4aae2208 100644 --- a/novelwriter/extensions/statusled.py +++ b/novelwriter/extensions/statusled.py @@ -82,7 +82,7 @@ class StatusLED(QAbstractButton): """Draw the LED.""" painter = QPainter(self) painter.setRenderHint(QtPaintAnitAlias, True) - painter.setPen(self.palette().mid().color()) + painter.setPen(self.palette().windowText().color()) painter.setBrush(self._color) painter.setOpacity(1.0) painter.drawEllipse( From ea89e66a46c76e30ae0aa5ee41edaf5affa675bf Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 7 Jul 2024 19:59:35 +0200 Subject: [PATCH 65/67] Focus project name field when entering new project form on welcome dialog (#1967) --- novelwriter/tools/welcome.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/novelwriter/tools/welcome.py b/novelwriter/tools/welcome.py index b962e98c..7e2a20a3 100644 --- a/novelwriter/tools/welcome.py +++ b/novelwriter/tools/welcome.py @@ -208,6 +208,7 @@ class GuiWelcome(NDialog): """Show the create new project page.""" self.mainStack.setCurrentWidget(self.tabNew) self._setButtonVisibility() + self.tabNew.enterForm() return @pyqtSlot() @@ -503,6 +504,8 @@ class _NewProjectPage(QWidget): self.scrollArea.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded) self.scrollArea.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded) + self.enterForm = self.projectForm.enterForm + # Assemble # ======== @@ -696,6 +699,12 @@ class _NewProjectForm(QWidget): return + def enterForm(self) -> None: + """Focus the project name field when entering the form.""" + self.projName.setFocus() + self.projName.selectAll() + return + def getProjectData(self) -> dict: """Collect form data and return it as a dictionary.""" roots = [] From dcecaae3afd4737f9bb4eb17ad58c9af72f7e2cb Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Mon, 8 Jul 2024 14:01:42 +0200 Subject: [PATCH 66/67] Fix indent info not passed between pages (#1965) --- novelwriter/core/tokenizer.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/novelwriter/core/tokenizer.py b/novelwriter/core/tokenizer.py index a2238b73..6e420f5d 100644 --- a/novelwriter/core/tokenizer.py +++ b/novelwriter/core/tokenizer.py @@ -198,6 +198,7 @@ class Tokenizer(ABC): # Instance Variables self._hFormatter = HeadingFormatter(self._project) self._noSep = True # Flag to indicate that we don't want a scene separator + self._noIndent = False # Flag to disable text indent on next paragraph self._showDialog = False # Flag for dialogue highlighting # This File @@ -873,7 +874,6 @@ class Tokenizer(ABC): pLines: list[T_Token] = [] tCount = len(tokens) - pIndent = True for n, cToken in enumerate(tokens): if n > 0: @@ -881,11 +881,11 @@ class Tokenizer(ABC): if n < tCount - 1: nToken = tokens[n+1] # Look ahead - if not self._indentFirst and cToken[0] in self.L_SKIP_INDENT: + if cToken[0] in self.L_SKIP_INDENT and not self._indentFirst: # Unless the indentFirst flag is set, we set up the next # paragraph to not be indented if we see a block of a # specific type - pIndent = False + self._noIndent = True if cToken[0] == self.T_EMPTY: # We don't need to keep the empty lines after this pass @@ -910,7 +910,7 @@ class Tokenizer(ABC): # Next token is not text, so we add the buffer to tokens nLines = len(pLines) cStyle = pLines[0][4] - if self._firstIndent and pIndent and not cStyle & self.M_ALIGNED: + if self._firstIndent and not (self._noIndent or cStyle & self.M_ALIGNED): # If paragraph indentation is enabled, not temporarily # turned off, and the block is not aligned, we add the # text indentation flag @@ -938,7 +938,7 @@ class Tokenizer(ABC): # Reset buffer and make sure text indent is on for next pass pLines = [] - pIndent = True + self._noIndent = False else: self._tokens.append(cToken) From 69d97a3f3ea9c8daf752e8e79d69d82a3d903db4 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Mon, 8 Jul 2024 14:02:05 +0200 Subject: [PATCH 67/67] Add additional test coverage --- tests/test_core/test_core_tokenizer.py | 83 ++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/tests/test_core/test_core_tokenizer.py b/tests/test_core/test_core_tokenizer.py index aa23ad1d..2932fe45 100644 --- a/tests/test_core/test_core_tokenizer.py +++ b/tests/test_core/test_core_tokenizer.py @@ -1324,6 +1324,89 @@ def testCoreToken_SpecialFormat(mockGUI): ] +@pytest.mark.core +def testCoreToken_TextIndent(mockGUI): + """Test the handling of text indent in the Tokenizer class.""" + project = NWProject() + tokens = BareTokenizer(project) + + # No First Indent + tokens.setFirstLineIndent(True, 1.0, False) + + assert tokens._noIndent is False + assert tokens._firstIndent is True + assert tokens._firstWidth == 1.0 + assert tokens._indentFirst is False + + # Page One + # Two paragraphs in the same scene + tokens._text = ( + "# Title One\n\n" + "### Scene One\n\n" + "First paragraph.\n\n" + "Second paragraph.\n\n" + ) + tokens.tokenizeText() + assert tokens._tokens == [ + (Tokenizer.T_HEAD1, 1, "Title One", [], Tokenizer.A_NONE), + (Tokenizer.T_HEAD3, 2, "Scene One", [], Tokenizer.A_NONE), + (Tokenizer.T_TEXT, 2, "First paragraph.", [], Tokenizer.A_NONE), + (Tokenizer.T_TEXT, 2, "Second paragraph.", [], Tokenizer.A_IND_T), + ] + assert tokens._noIndent is False + + # Page Two + # New scene with only a synopsis + tokens._text = ( + "### Scene Two\n\n" + "%Synopsis: Stuff happens.\n\n" + ) + tokens.tokenizeText() + assert tokens._tokens == [ + (Tokenizer.T_HEAD3, 1, "Scene Two", [], Tokenizer.A_NONE), + (Tokenizer.T_SYNOPSIS, 1, "Stuff happens.", [], Tokenizer.A_NONE), + ] + assert tokens._noIndent is True + + # Page Three + # Two paragraphs for the scene on the previous page + tokens._text = ( + "First paragraph.\n\n" + "Second paragraph.\n\n" + ) + tokens.tokenizeText() + assert tokens._tokens == [ + (Tokenizer.T_TEXT, 0, "First paragraph.", [], Tokenizer.A_NONE), + (Tokenizer.T_TEXT, 0, "Second paragraph.", [], Tokenizer.A_IND_T), + ] + assert tokens._noIndent is False + + # First Indent + tokens.setFirstLineIndent(True, 1.0, True) + + assert tokens._noIndent is False + assert tokens._firstIndent is True + assert tokens._firstWidth == 1.0 + assert tokens._indentFirst is True + + # Page Four + # Two paragraphs in the same scene + tokens._text = ( + "# Title One\n\n" + "### Scene One\n\n" + "First paragraph.\n\n" + "Second paragraph.\n\n" + ) + tokens.tokenizeText() + assert tokens._tokens == [ + (Tokenizer.T_HEAD1, 1, "Title One", [], Tokenizer.A_NONE), + (Tokenizer.T_HEAD3, 2, "Scene One", [], Tokenizer.A_NONE), + (Tokenizer.T_TEXT, 2, "First paragraph.", [], Tokenizer.A_IND_T), + (Tokenizer.T_TEXT, 2, "Second paragraph.", [], Tokenizer.A_IND_T), + ] + assert tokens._noIndent is False + + @pytest.mark.core def testCoreToken_ProcessHeaders(mockGUI): """Test the header and page parser of the Tokenizer class."""