Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-03-17 11:56:34 +01:00
parent 227c30cce3 cfcf05fdad
commit c3aa8fec56
16 changed files with 1973 additions and 2076 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+27
View File
@@ -1,5 +1,32 @@
# novelWriter Changelog # novelWriter Changelog
## Version 2.3.1 [2024-03-17]
### Release Notes
This is a patch release that fixes several issues with translations into other languages than the
default English, and adds completed translations for French.
### Detailed Changelog
**Internationalisation**
* Fix untranslated text on the "Project Word List" dialog. PR #1744. Issue #1746.
* Fix untranslated text on the dialog that pops up after an upgrade, PR #1754. Issue #1749.
* Fix error in Norwegian translation. PR #1744.
* Allow the translated text for adding chapter and scenes on the Welcome dialog to flow around the
number selector since the number is inserted into the sentence, and not all languages will split
the sentence around the number like is done in English. PR #1754. Issue #1750.
* French translation updated by Albert Aribaud (@aaribaud). PR #1760.
* Minor updates to other translations for the 2.3.1 fixes by other contributors. PR #1760.
**Other Changes**
* Bump the revision of the project file format to 1.5 Revision 3 from Revision 2. This should have
been done in the 2.3 release due to the addition of the Templates root folder type. PR #1748.
----
## Version 2.3 [2024-03-10] ## Version 2.3 [2024-03-10]
### Release Notes ### Release Notes
i18n/nw_base.ts
+38 -38
View File
@@ -3180,37 +3180,37 @@
<context> <context>
<name>GuiWelcome</name> <name>GuiWelcome</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="67" /> <location filename="../novelwriter/tools/welcome.py" line="68" />
<source>Welcome</source> <source>Welcome</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="109" /> <location filename="../novelwriter/tools/welcome.py" line="110" />
<source>List</source> <source>List</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="113" /> <location filename="../novelwriter/tools/welcome.py" line="114" />
<source>New</source> <source>New</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="117" /> <location filename="../novelwriter/tools/welcome.py" line="118" />
<source>Browse</source> <source>Browse</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="121" /> <location filename="../novelwriter/tools/welcome.py" line="122" />
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="125" /> <location filename="../novelwriter/tools/welcome.py" line="126" />
<source>Create</source> <source>Create</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="129" /> <location filename="../novelwriter/tools/welcome.py" line="130" />
<source>Open</source> <source>Open</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
@@ -4124,117 +4124,117 @@
<context> <context>
<name>_NewProjectForm</name> <name>_NewProjectForm</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="569" /> <location filename="../novelwriter/tools/welcome.py" line="570" />
<source>Required</source> <source>Required</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="575" /> <location filename="../novelwriter/tools/welcome.py" line="576" />
<source>Optional</source> <source>Optional</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="598" /> <location filename="../novelwriter/tools/welcome.py" line="599" />
<source>Create a fresh project</source> <source>Create a fresh project</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="602" /> <location filename="../novelwriter/tools/welcome.py" line="603" />
<source>Create an example project</source> <source>Create an example project</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="606" /> <location filename="../novelwriter/tools/welcome.py" line="607" />
<source>Copy an existing project</source> <source>Copy an existing project</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="620" /> <location filename="../novelwriter/tools/welcome.py" line="621" />
<source>Project Name</source> <source>Project Name</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="621" /> <location filename="../novelwriter/tools/welcome.py" line="622" />
<source>Author</source> <source>Author</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="622" /> <location filename="../novelwriter/tools/welcome.py" line="623" />
<source>Project Path</source> <source>Project Path</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="623" /> <location filename="../novelwriter/tools/welcome.py" line="624" />
<source>Prefill Project</source> <source>Prefill Project</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="631" /> <location filename="../novelwriter/tools/welcome.py" line="632" />
<source>Set to 0 to only add scenes</source> <source>Set to 0 to only add scenes</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="633" /> <location filename="../novelwriter/tools/welcome.py" line="635" />
<source>Add {0} chapter documents</source> <source>Add {0} chapter documents</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="634" /> <location filename="../novelwriter/tools/welcome.py" line="644" />
<source>Add {0} scene documents (to each chapter)</source> <source>Add {0} scene documents (to each chapter)</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="680" /> <location filename="../novelwriter/tools/welcome.py" line="672" />
<source>Add a folder for plot notes</source> <source>Add a folder for plot notes</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="681" /> <location filename="../novelwriter/tools/welcome.py" line="673" />
<source>Add a folder for character notes</source> <source>Add a folder for character notes</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="682" /> <location filename="../novelwriter/tools/welcome.py" line="674" />
<source>Add a folder for location notes</source> <source>Add a folder for location notes</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="683" /> <location filename="../novelwriter/tools/welcome.py" line="675" />
<source>Add example notes to the above</source> <source>Add example notes to the above</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="689" /> <location filename="../novelwriter/tools/welcome.py" line="681" />
<source>Chapters and Scenes</source> <source>Chapters and Scenes</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="692" /> <location filename="../novelwriter/tools/welcome.py" line="684" />
<source>Project Notes</source> <source>Project Notes</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="701" /> <location filename="../novelwriter/tools/welcome.py" line="693" />
<source>Create New Project</source> <source>Create New Project</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="744" /> <location filename="../novelwriter/tools/welcome.py" line="736" />
<source>Select Project Folder</source> <source>Select Project Folder</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="800" /> <location filename="../novelwriter/tools/welcome.py" line="792" />
<source>Fresh Project</source> <source>Fresh Project</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="802" /> <location filename="../novelwriter/tools/welcome.py" line="794" />
<source>Example Project</source> <source>Example Project</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="804" /> <location filename="../novelwriter/tools/welcome.py" line="796" />
<source>Template: {0}</source> <source>Template: {0}</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
@@ -4242,7 +4242,7 @@
<context> <context>
<name>_NewProjectPage</name> <name>_NewProjectPage</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="537" /> <location filename="../novelwriter/tools/welcome.py" line="538" />
<source>A project name is required.</source> <source>A project name is required.</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
@@ -4250,27 +4250,27 @@
<context> <context>
<name>_OpenProjectPage</name> <name>_OpenProjectPage</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="288" /> <location filename="../novelwriter/tools/welcome.py" line="289" />
<source>The project path is not reachable.</source> <source>The project path is not reachable.</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="335" /> <location filename="../novelwriter/tools/welcome.py" line="336" />
<source>Path</source> <source>Path</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="355" /> <location filename="../novelwriter/tools/welcome.py" line="356" />
<source>Remove '{0}' from the recent projects list? The project files will not be deleted.</source> <source>Remove '{0}' from the recent projects list? The project files will not be deleted.</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="369" /> <location filename="../novelwriter/tools/welcome.py" line="370" />
<source>Open Project</source> <source>Open Project</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="371" /> <location filename="../novelwriter/tools/welcome.py" line="372" />
<source>Remove Project</source> <source>Remove Project</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
@@ -4361,12 +4361,12 @@
<context> <context>
<name>_ProjectListModel</name> <name>_ProjectListModel</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="454" /> <location filename="../novelwriter/tools/welcome.py" line="455" />
<source>Word Count</source> <source>Word Count</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="455" /> <location filename="../novelwriter/tools/welcome.py" line="456" />
<source>Last Opened</source> <source>Last Opened</source>
<translation type="unfinished" /> <translation type="unfinished" />
</message> </message>
i18n/nw_es_419.ts
+49 -50
View File
@@ -1313,6 +1313,11 @@
<source>novelWriter is ready ...</source> <source>novelWriter is ready ...</source>
<translation>novelWriter ya está listo...</translation> <translation>novelWriter ya está listo...</translation>
</message> </message>
<message>
<location filename="../novelwriter/guimain.py" line="357" />
<source>You are now running novelWriter version {0}.</source>
<translation>Está usando la versión {0} de novelWriter.</translation>
</message>
<message> <message>
<location filename="../novelwriter/guimain.py" line="360" /> <location filename="../novelwriter/guimain.py" line="360" />
<source>Please check the {0}release notes{1} for further details.</source> <source>Please check the {0}release notes{1} for further details.</source>
@@ -3175,37 +3180,37 @@
<context> <context>
<name>GuiWelcome</name> <name>GuiWelcome</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="67" /> <location filename="../novelwriter/tools/welcome.py" line="68" />
<source>Welcome</source> <source>Welcome</source>
<translation>Bienvenida</translation> <translation>Bienvenida</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="109" /> <location filename="../novelwriter/tools/welcome.py" line="110" />
<source>List</source> <source>List</source>
<translation>Lista</translation> <translation>Lista</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="113" /> <location filename="../novelwriter/tools/welcome.py" line="114" />
<source>New</source> <source>New</source>
<translation>Nuevo</translation> <translation>Nuevo</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="117" /> <location filename="../novelwriter/tools/welcome.py" line="118" />
<source>Browse</source> <source>Browse</source>
<translation>Abrir ubicación</translation> <translation>Abrir ubicación</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="121" /> <location filename="../novelwriter/tools/welcome.py" line="122" />
<source>Cancel</source> <source>Cancel</source>
<translation>Cancelar</translation> <translation>Cancelar</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="125" /> <location filename="../novelwriter/tools/welcome.py" line="126" />
<source>Create</source> <source>Create</source>
<translation>Crear</translation> <translation>Crear</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="129" /> <location filename="../novelwriter/tools/welcome.py" line="130" />
<source>Open</source> <source>Open</source>
<translation>Abrir</translation> <translation>Abrir</translation>
</message> </message>
@@ -4119,123 +4124,117 @@
<context> <context>
<name>_NewProjectForm</name> <name>_NewProjectForm</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="569" /> <location filename="../novelwriter/tools/welcome.py" line="570" />
<source>Required</source> <source>Required</source>
<translation>Requerido</translation> <translation>Requerido</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="575" /> <location filename="../novelwriter/tools/welcome.py" line="576" />
<source>Optional</source> <source>Optional</source>
<translation>Opcional</translation> <translation>Opcional</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="598" /> <location filename="../novelwriter/tools/welcome.py" line="599" />
<source>Create a fresh project</source> <source>Create a fresh project</source>
<translation>Crear un nuevo proyecto</translation> <translation>Crear un nuevo proyecto</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="602" /> <location filename="../novelwriter/tools/welcome.py" line="603" />
<source>Create an example project</source> <source>Create an example project</source>
<translation>Crear un ejemplo de proyecto</translation> <translation>Crear un ejemplo de proyecto</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="606" /> <location filename="../novelwriter/tools/welcome.py" line="607" />
<source>Copy an existing project</source> <source>Copy an existing project</source>
<translation>Copiar un proyecto existente</translation> <translation>Copiar un proyecto existente</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="620" /> <location filename="../novelwriter/tools/welcome.py" line="621" />
<source>Project Name</source> <source>Project Name</source>
<translation>Nombre del Proyecto</translation> <translation>Nombre del Proyecto</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="621" /> <location filename="../novelwriter/tools/welcome.py" line="622" />
<source>Author</source> <source>Author</source>
<translation>Autor(es)</translation> <translation>Autor(es)</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="622" /> <location filename="../novelwriter/tools/welcome.py" line="623" />
<source>Project Path</source> <source>Project Path</source>
<translation>Ruta del Proyecto</translation> <translation>Ruta del Proyecto</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="623" /> <location filename="../novelwriter/tools/welcome.py" line="624" />
<source>Prefill Project</source> <source>Prefill Project</source>
<translation>Rellenar el Proyecto</translation> <translation>Rellenar el Proyecto</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="631" /> <location filename="../novelwriter/tools/welcome.py" line="632" />
<source>Set to 0 to only add scenes</source> <source>Set to 0 to only add scenes</source>
<translation>Escoger 0 para solo añadir escenas</translation> <translation>Escoger 0 para solo añadir escenas</translation>
</message> </message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="635" />
<source>Add {0} chapter documents</source>
<translation>Incluir {0} capítulos</translation>
</message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="644" /> <location filename="../novelwriter/tools/welcome.py" line="644" />
<location filename="../novelwriter/tools/welcome.py" line="634" /> <source>Add {0} scene documents (to each chapter)</source>
<source>Add</source> <translation>Incluir {0} escenas (a cada capítulo)</translation>
<translation>Añadir</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="636" /> <location filename="../novelwriter/tools/welcome.py" line="672" />
<source>chapter documents</source>
<translation>capítulos</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="646" />
<source>scene documents (to each chapter)</source>
<translation>escenas (a cada capítulo)</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="673" />
<source>Add a folder for plot notes</source> <source>Add a folder for plot notes</source>
<translation>Añadir una carpeta para notas argumentales</translation> <translation>Añadir una carpeta para notas argumentales</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="674" /> <location filename="../novelwriter/tools/welcome.py" line="673" />
<source>Add a folder for character notes</source> <source>Add a folder for character notes</source>
<translation>Añadir una carpeta para notas sobre los personajes</translation> <translation>Añadir una carpeta para notas sobre los personajes</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="675" /> <location filename="../novelwriter/tools/welcome.py" line="674" />
<source>Add a folder for location notes</source> <source>Add a folder for location notes</source>
<translation>Añadir una carpeta para notas acerca de los lugares</translation> <translation>Añadir una carpeta para notas acerca de los lugares</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="676" /> <location filename="../novelwriter/tools/welcome.py" line="675" />
<source>Add example notes to the above</source> <source>Add example notes to the above</source>
<translation>Añadir ejemplos de notas</translation> <translation>Añadir ejemplos de notas</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="682" /> <location filename="../novelwriter/tools/welcome.py" line="681" />
<source>Chapters and Scenes</source> <source>Chapters and Scenes</source>
<translation>Capítulos y Escenas</translation> <translation>Capítulos y Escenas</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="685" /> <location filename="../novelwriter/tools/welcome.py" line="684" />
<source>Project Notes</source> <source>Project Notes</source>
<translation>Notas del Proyecto</translation> <translation>Notas del Proyecto</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="694" /> <location filename="../novelwriter/tools/welcome.py" line="693" />
<source>Create New Project</source> <source>Create New Project</source>
<translation>Crear un Proyecto Nuevo</translation> <translation>Crear un Proyecto Nuevo</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="737" /> <location filename="../novelwriter/tools/welcome.py" line="736" />
<source>Select Project Folder</source> <source>Select Project Folder</source>
<translation>Escoger la Carpeta del Proyecto</translation> <translation>Escoger la Carpeta del Proyecto</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="793" /> <location filename="../novelwriter/tools/welcome.py" line="792" />
<source>Fresh Project</source> <source>Fresh Project</source>
<translation>Proyecto vacío</translation> <translation>Proyecto vacío</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="795" /> <location filename="../novelwriter/tools/welcome.py" line="794" />
<source>Example Project</source> <source>Example Project</source>
<translation>Ejemplo de Proyecto</translation> <translation>Ejemplo de Proyecto</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="797" /> <location filename="../novelwriter/tools/welcome.py" line="796" />
<source>Template: {0}</source> <source>Template: {0}</source>
<translation>Plantilla: {0}</translation> <translation>Plantilla: {0}</translation>
</message> </message>
@@ -4243,7 +4242,7 @@
<context> <context>
<name>_NewProjectPage</name> <name>_NewProjectPage</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="537" /> <location filename="../novelwriter/tools/welcome.py" line="538" />
<source>A project name is required.</source> <source>A project name is required.</source>
<translation>Se requiere un nombre de proyecto.</translation> <translation>Se requiere un nombre de proyecto.</translation>
</message> </message>
@@ -4251,27 +4250,27 @@
<context> <context>
<name>_OpenProjectPage</name> <name>_OpenProjectPage</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="288" /> <location filename="../novelwriter/tools/welcome.py" line="289" />
<source>The project path is not reachable.</source> <source>The project path is not reachable.</source>
<translation>No se puede acceder a la ruta del proyecto.</translation> <translation>No se puede acceder a la ruta del proyecto.</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="335" /> <location filename="../novelwriter/tools/welcome.py" line="336" />
<source>Path</source> <source>Path</source>
<translation>Ruta</translation> <translation>Ruta</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="355" /> <location filename="../novelwriter/tools/welcome.py" line="356" />
<source>Remove '{0}' from the recent projects list? The project files will not be deleted.</source> <source>Remove '{0}' from the recent projects list? The project files will not be deleted.</source>
<translation>¿Eliminar '{0}' de la lista de proyectos recientes? Los archivos del proyecto no se eliminarán.</translation> <translation>¿Eliminar '{0}' de la lista de proyectos recientes? Los archivos del proyecto no se eliminarán.</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="369" /> <location filename="../novelwriter/tools/welcome.py" line="370" />
<source>Open Project</source> <source>Open Project</source>
<translation>Abrir un Proyecto</translation> <translation>Abrir un Proyecto</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="371" /> <location filename="../novelwriter/tools/welcome.py" line="372" />
<source>Remove Project</source> <source>Remove Project</source>
<translation>Eliminar Proyecto</translation> <translation>Eliminar Proyecto</translation>
</message> </message>
@@ -4362,14 +4361,14 @@
<context> <context>
<name>_ProjectListModel</name> <name>_ProjectListModel</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="454" /> <location filename="../novelwriter/tools/welcome.py" line="455" />
<source>Word Count</source> <source>Word Count</source>
<translation>Total de Palabras</translation> <translation>Total de Palabras</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="455" /> <location filename="../novelwriter/tools/welcome.py" line="456" />
<source>Last Opened</source> <source>Last Opened</source>
<translation>Abierto por Última Vez</translation> <translation>Abierto por última vez</translation>
</message> </message>
</context> </context>
<context> <context>
i18n/nw_fr_FR.ts
+1689 -1821
View File
File diff suppressed because it is too large Load Diff
i18n/nw_it_IT.ts
+48 -49
View File
@@ -1313,6 +1313,11 @@
<source>novelWriter is ready ...</source> <source>novelWriter is ready ...</source>
<translation>novelWriter è pronto...</translation> <translation>novelWriter è pronto...</translation>
</message> </message>
<message>
<location filename="../novelwriter/guimain.py" line="357" />
<source>You are now running novelWriter version {0}.</source>
<translation>Stai ora eseguendo la versione {0} di novelWriter.</translation>
</message>
<message> <message>
<location filename="../novelwriter/guimain.py" line="360" /> <location filename="../novelwriter/guimain.py" line="360" />
<source>Please check the {0}release notes{1} for further details.</source> <source>Please check the {0}release notes{1} for further details.</source>
@@ -3175,37 +3180,37 @@
<context> <context>
<name>GuiWelcome</name> <name>GuiWelcome</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="67" /> <location filename="../novelwriter/tools/welcome.py" line="68" />
<source>Welcome</source> <source>Welcome</source>
<translation>Benvenuto/a</translation> <translation>Benvenuto/a</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="109" /> <location filename="../novelwriter/tools/welcome.py" line="110" />
<source>List</source> <source>List</source>
<translation>Elenco</translation> <translation>Elenco</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="113" /> <location filename="../novelwriter/tools/welcome.py" line="114" />
<source>New</source> <source>New</source>
<translation>Nuovo</translation> <translation>Nuovo</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="117" /> <location filename="../novelwriter/tools/welcome.py" line="118" />
<source>Browse</source> <source>Browse</source>
<translation>Sfoglia</translation> <translation>Sfoglia</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="121" /> <location filename="../novelwriter/tools/welcome.py" line="122" />
<source>Cancel</source> <source>Cancel</source>
<translation>Cancella</translation> <translation>Cancella</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="125" /> <location filename="../novelwriter/tools/welcome.py" line="126" />
<source>Create</source> <source>Create</source>
<translation>Crea</translation> <translation>Crea</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="129" /> <location filename="../novelwriter/tools/welcome.py" line="130" />
<source>Open</source> <source>Open</source>
<translation>Apri</translation> <translation>Apri</translation>
</message> </message>
@@ -4119,123 +4124,117 @@
<context> <context>
<name>_NewProjectForm</name> <name>_NewProjectForm</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="569" /> <location filename="../novelwriter/tools/welcome.py" line="570" />
<source>Required</source> <source>Required</source>
<translation>Necessario</translation> <translation>Necessario</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="575" /> <location filename="../novelwriter/tools/welcome.py" line="576" />
<source>Optional</source> <source>Optional</source>
<translation>Facoltativo</translation> <translation>Facoltativo</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="598" /> <location filename="../novelwriter/tools/welcome.py" line="599" />
<source>Create a fresh project</source> <source>Create a fresh project</source>
<translation>Crea un nuovo progetto</translation> <translation>Crea un nuovo progetto</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="602" /> <location filename="../novelwriter/tools/welcome.py" line="603" />
<source>Create an example project</source> <source>Create an example project</source>
<translation>Crea un progetto di esempio</translation> <translation>Crea un progetto di esempio</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="606" /> <location filename="../novelwriter/tools/welcome.py" line="607" />
<source>Copy an existing project</source> <source>Copy an existing project</source>
<translation>Copia un progetto esistente</translation> <translation>Copia un progetto esistente</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="620" /> <location filename="../novelwriter/tools/welcome.py" line="621" />
<source>Project Name</source> <source>Project Name</source>
<translation>Nome del progetto</translation> <translation>Nome del progetto</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="621" /> <location filename="../novelwriter/tools/welcome.py" line="622" />
<source>Author</source> <source>Author</source>
<translation>Autore</translation> <translation>Autore</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="622" /> <location filename="../novelwriter/tools/welcome.py" line="623" />
<source>Project Path</source> <source>Project Path</source>
<translation>Percorso del progetto</translation> <translation>Percorso del progetto</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="623" /> <location filename="../novelwriter/tools/welcome.py" line="624" />
<source>Prefill Project</source> <source>Prefill Project</source>
<translation>Tipo di progetto</translation> <translation>Tipo di progetto</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="631" /> <location filename="../novelwriter/tools/welcome.py" line="632" />
<source>Set to 0 to only add scenes</source> <source>Set to 0 to only add scenes</source>
<translation>Imposta a 0 per aggiungere solo scene</translation> <translation>Imposta a 0 per aggiungere solo scene</translation>
</message> </message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="635" />
<source>Add {0} chapter documents</source>
<translation>Aggiungi {0} capitoli come documenti</translation>
</message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="644" /> <location filename="../novelwriter/tools/welcome.py" line="644" />
<location filename="../novelwriter/tools/welcome.py" line="634" /> <source>Add {0} scene documents (to each chapter)</source>
<source>Add</source> <translation>Aggiungi {0} scene come documenti (a ogni capitolo)</translation>
<translation>Aggiungi</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="636" /> <location filename="../novelwriter/tools/welcome.py" line="672" />
<source>chapter documents</source>
<translation>documenti di capitolo</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="646" />
<source>scene documents (to each chapter)</source>
<translation>documenti di scena (per ogni capitolo)</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="673" />
<source>Add a folder for plot notes</source> <source>Add a folder for plot notes</source>
<translation>Aggiungi una cartella per le note sulla trama</translation> <translation>Aggiungi una cartella per le note sulla trama</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="674" /> <location filename="../novelwriter/tools/welcome.py" line="673" />
<source>Add a folder for character notes</source> <source>Add a folder for character notes</source>
<translation>Aggiungi una cartella per le note sui personaggi</translation> <translation>Aggiungi una cartella per le note sui personaggi</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="675" /> <location filename="../novelwriter/tools/welcome.py" line="674" />
<source>Add a folder for location notes</source> <source>Add a folder for location notes</source>
<translation>Aggiungi una cartella per le note sulle località</translation> <translation>Aggiungi una cartella per le note sulle località</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="676" /> <location filename="../novelwriter/tools/welcome.py" line="675" />
<source>Add example notes to the above</source> <source>Add example notes to the above</source>
<translation>Aggiungi note di esempio alle precedenti</translation> <translation>Aggiungi note di esempio alle precedenti</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="682" /> <location filename="../novelwriter/tools/welcome.py" line="681" />
<source>Chapters and Scenes</source> <source>Chapters and Scenes</source>
<translation>Capitoli e scene</translation> <translation>Capitoli e scene</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="685" /> <location filename="../novelwriter/tools/welcome.py" line="684" />
<source>Project Notes</source> <source>Project Notes</source>
<translation>Note del progetto</translation> <translation>Note del progetto</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="694" /> <location filename="../novelwriter/tools/welcome.py" line="693" />
<source>Create New Project</source> <source>Create New Project</source>
<translation>Crea un nuovo progetto</translation> <translation>Crea un nuovo progetto</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="737" /> <location filename="../novelwriter/tools/welcome.py" line="736" />
<source>Select Project Folder</source> <source>Select Project Folder</source>
<translation>Seleziona la cartella del progetto</translation> <translation>Seleziona la cartella del progetto</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="793" /> <location filename="../novelwriter/tools/welcome.py" line="792" />
<source>Fresh Project</source> <source>Fresh Project</source>
<translation>Nuovo progetto</translation> <translation>Nuovo progetto</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="795" /> <location filename="../novelwriter/tools/welcome.py" line="794" />
<source>Example Project</source> <source>Example Project</source>
<translation>Progetto di esempio</translation> <translation>Progetto di esempio</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="797" /> <location filename="../novelwriter/tools/welcome.py" line="796" />
<source>Template: {0}</source> <source>Template: {0}</source>
<translation>Modello: {0}</translation> <translation>Modello: {0}</translation>
</message> </message>
@@ -4243,7 +4242,7 @@
<context> <context>
<name>_NewProjectPage</name> <name>_NewProjectPage</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="537" /> <location filename="../novelwriter/tools/welcome.py" line="538" />
<source>A project name is required.</source> <source>A project name is required.</source>
<translation>È richiesto un nome di progetto.</translation> <translation>È richiesto un nome di progetto.</translation>
</message> </message>
@@ -4251,27 +4250,27 @@
<context> <context>
<name>_OpenProjectPage</name> <name>_OpenProjectPage</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="288" /> <location filename="../novelwriter/tools/welcome.py" line="289" />
<source>The project path is not reachable.</source> <source>The project path is not reachable.</source>
<translation>Il percorso del progetto non è raggiungibile.</translation> <translation>Il percorso del progetto non è raggiungibile.</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="335" /> <location filename="../novelwriter/tools/welcome.py" line="336" />
<source>Path</source> <source>Path</source>
<translation>Percorso</translation> <translation>Percorso</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="355" /> <location filename="../novelwriter/tools/welcome.py" line="356" />
<source>Remove '{0}' from the recent projects list? The project files will not be deleted.</source> <source>Remove '{0}' from the recent projects list? The project files will not be deleted.</source>
<translation>Rimuovere '{0}' dalla lista dei progetti recenti? I file del progetto non verranno eliminati.</translation> <translation>Rimuovere '{0}' dalla lista dei progetti recenti? I file del progetto non verranno eliminati.</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="369" /> <location filename="../novelwriter/tools/welcome.py" line="370" />
<source>Open Project</source> <source>Open Project</source>
<translation>Apri il progetto</translation> <translation>Apri il progetto</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="371" /> <location filename="../novelwriter/tools/welcome.py" line="372" />
<source>Remove Project</source> <source>Remove Project</source>
<translation>Rimuovi il progetto</translation> <translation>Rimuovi il progetto</translation>
</message> </message>
@@ -4362,12 +4361,12 @@
<context> <context>
<name>_ProjectListModel</name> <name>_ProjectListModel</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="454" /> <location filename="../novelwriter/tools/welcome.py" line="455" />
<source>Word Count</source> <source>Word Count</source>
<translation>Conteggio delle parole</translation> <translation>Conteggio delle parole</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="455" /> <location filename="../novelwriter/tools/welcome.py" line="456" />
<source>Last Opened</source> <source>Last Opened</source>
<translation>Ultima apertura</translation> <translation>Ultima apertura</translation>
</message> </message>
i18n/nw_ja_JP.ts
+48 -49
View File
@@ -1313,6 +1313,11 @@
<source>novelWriter is ready ...</source> <source>novelWriter is ready ...</source>
<translation>novelWriterの準備ができました...</translation> <translation>novelWriterの準備ができました...</translation>
</message> </message>
<message>
<location filename="../novelwriter/guimain.py" line="357" />
<source>You are now running novelWriter version {0}.</source>
<translation>novelWriter バージョン {0} を実行しています。</translation>
</message>
<message> <message>
<location filename="../novelwriter/guimain.py" line="360" /> <location filename="../novelwriter/guimain.py" line="360" />
<source>Please check the {0}release notes{1} for further details.</source> <source>Please check the {0}release notes{1} for further details.</source>
@@ -3175,37 +3180,37 @@
<context> <context>
<name>GuiWelcome</name> <name>GuiWelcome</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="67" /> <location filename="../novelwriter/tools/welcome.py" line="68" />
<source>Welcome</source> <source>Welcome</source>
<translation>ようこそ</translation> <translation>ようこそ</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="109" /> <location filename="../novelwriter/tools/welcome.py" line="110" />
<source>List</source> <source>List</source>
<translation>一覧</translation> <translation>一覧</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="113" /> <location filename="../novelwriter/tools/welcome.py" line="114" />
<source>New</source> <source>New</source>
<translation>新規</translation> <translation>新規</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="117" /> <location filename="../novelwriter/tools/welcome.py" line="118" />
<source>Browse</source> <source>Browse</source>
<translation>ブラウズ</translation> <translation>ブラウズ</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="121" /> <location filename="../novelwriter/tools/welcome.py" line="122" />
<source>Cancel</source> <source>Cancel</source>
<translation>キャンセル</translation> <translation>キャンセル</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="125" /> <location filename="../novelwriter/tools/welcome.py" line="126" />
<source>Create</source> <source>Create</source>
<translation>作成</translation> <translation>作成</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="129" /> <location filename="../novelwriter/tools/welcome.py" line="130" />
<source>Open</source> <source>Open</source>
<translation>開く</translation> <translation>開く</translation>
</message> </message>
@@ -4119,123 +4124,117 @@
<context> <context>
<name>_NewProjectForm</name> <name>_NewProjectForm</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="569" /> <location filename="../novelwriter/tools/welcome.py" line="570" />
<source>Required</source> <source>Required</source>
<translation>必須</translation> <translation>必須</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="575" /> <location filename="../novelwriter/tools/welcome.py" line="576" />
<source>Optional</source> <source>Optional</source>
<translation>任意</translation> <translation>任意</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="598" /> <location filename="../novelwriter/tools/welcome.py" line="599" />
<source>Create a fresh project</source> <source>Create a fresh project</source>
<translation>新鮮なプロジェクトを作成</translation> <translation>新鮮なプロジェクトを作成</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="602" /> <location filename="../novelwriter/tools/welcome.py" line="603" />
<source>Create an example project</source> <source>Create an example project</source>
<translation>サンプルプロジェクトを作成</translation> <translation>サンプルプロジェクトを作成</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="606" /> <location filename="../novelwriter/tools/welcome.py" line="607" />
<source>Copy an existing project</source> <source>Copy an existing project</source>
<translation>既存のプロジェクトをコピー</translation> <translation>既存のプロジェクトをコピー</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="620" /> <location filename="../novelwriter/tools/welcome.py" line="621" />
<source>Project Name</source> <source>Project Name</source>
<translation>プロジェクト名</translation> <translation>プロジェクト名</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="621" /> <location filename="../novelwriter/tools/welcome.py" line="622" />
<source>Author</source> <source>Author</source>
<translation>著者</translation> <translation>著者</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="622" /> <location filename="../novelwriter/tools/welcome.py" line="623" />
<source>Project Path</source> <source>Project Path</source>
<translation>プロジェクトパス</translation> <translation>プロジェクトパス</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="623" /> <location filename="../novelwriter/tools/welcome.py" line="624" />
<source>Prefill Project</source> <source>Prefill Project</source>
<translation>プロジェクトのプリフィル</translation> <translation>プロジェクトのプリフィル</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="631" /> <location filename="../novelwriter/tools/welcome.py" line="632" />
<source>Set to 0 to only add scenes</source> <source>Set to 0 to only add scenes</source>
<translation>シーンのみを追加するには0に設定してください</translation> <translation>シーンのみを追加するには0に設定してください</translation>
</message> </message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="635" />
<source>Add {0} chapter documents</source>
<translation>{0} 章ドキュメントを追加</translation>
</message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="644" /> <location filename="../novelwriter/tools/welcome.py" line="644" />
<location filename="../novelwriter/tools/welcome.py" line="634" /> <source>Add {0} scene documents (to each chapter)</source>
<source>Add</source> <translation>{0} 場面ドキュメントを追加(各章に)</translation>
<translation>追加</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="636" /> <location filename="../novelwriter/tools/welcome.py" line="672" />
<source>chapter documents</source>
<translation>章ドキュメント</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="646" />
<source>scene documents (to each chapter)</source>
<translation>場面ドキュメント(各章に)</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="673" />
<source>Add a folder for plot notes</source> <source>Add a folder for plot notes</source>
<translation>プロットノート用のフォルダーを追加</translation> <translation>プロットノート用のフォルダーを追加</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="674" /> <location filename="../novelwriter/tools/welcome.py" line="673" />
<source>Add a folder for character notes</source> <source>Add a folder for character notes</source>
<translation>登場人物ノート用のフォルダーを追加</translation> <translation>登場人物ノート用のフォルダーを追加</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="675" /> <location filename="../novelwriter/tools/welcome.py" line="674" />
<source>Add a folder for location notes</source> <source>Add a folder for location notes</source>
<translation>場所ノート用のフォルダーを追加</translation> <translation>場所ノート用のフォルダーを追加</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="676" /> <location filename="../novelwriter/tools/welcome.py" line="675" />
<source>Add example notes to the above</source> <source>Add example notes to the above</source>
<translation>上記にノートの例を追加する</translation> <translation>上記にノートの例を追加する</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="682" /> <location filename="../novelwriter/tools/welcome.py" line="681" />
<source>Chapters and Scenes</source> <source>Chapters and Scenes</source>
<translation>章と場面</translation> <translation>章と場面</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="685" /> <location filename="../novelwriter/tools/welcome.py" line="684" />
<source>Project Notes</source> <source>Project Notes</source>
<translation>プロジェクトノート</translation> <translation>プロジェクトノート</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="694" /> <location filename="../novelwriter/tools/welcome.py" line="693" />
<source>Create New Project</source> <source>Create New Project</source>
<translation>新規プロジェクトを作成</translation> <translation>新規プロジェクトを作成</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="737" /> <location filename="../novelwriter/tools/welcome.py" line="736" />
<source>Select Project Folder</source> <source>Select Project Folder</source>
<translation>プロジェクトフォルダーを選択</translation> <translation>プロジェクトフォルダーを選択</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="793" /> <location filename="../novelwriter/tools/welcome.py" line="792" />
<source>Fresh Project</source> <source>Fresh Project</source>
<translation>新鮮なプロジェクト</translation> <translation>新鮮なプロジェクト</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="795" /> <location filename="../novelwriter/tools/welcome.py" line="794" />
<source>Example Project</source> <source>Example Project</source>
<translation>サンプルプロジェクト</translation> <translation>サンプルプロジェクト</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="797" /> <location filename="../novelwriter/tools/welcome.py" line="796" />
<source>Template: {0}</source> <source>Template: {0}</source>
<translation>テンプレート: {0}</translation> <translation>テンプレート: {0}</translation>
</message> </message>
@@ -4243,7 +4242,7 @@
<context> <context>
<name>_NewProjectPage</name> <name>_NewProjectPage</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="537" /> <location filename="../novelwriter/tools/welcome.py" line="538" />
<source>A project name is required.</source> <source>A project name is required.</source>
<translation>プロジェクト名は必須です。</translation> <translation>プロジェクト名は必須です。</translation>
</message> </message>
@@ -4251,27 +4250,27 @@
<context> <context>
<name>_OpenProjectPage</name> <name>_OpenProjectPage</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="288" /> <location filename="../novelwriter/tools/welcome.py" line="289" />
<source>The project path is not reachable.</source> <source>The project path is not reachable.</source>
<translation>プロジェクトパスに到達できません。</translation> <translation>プロジェクトパスに到達できません。</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="335" /> <location filename="../novelwriter/tools/welcome.py" line="336" />
<source>Path</source> <source>Path</source>
<translation>パス</translation> <translation>パス</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="355" /> <location filename="../novelwriter/tools/welcome.py" line="356" />
<source>Remove '{0}' from the recent projects list? The project files will not be deleted.</source> <source>Remove '{0}' from the recent projects list? The project files will not be deleted.</source>
<translation>'{0}' を最近のプロジェクトリストから削除しますか？　プロジェクトファイルは削除されません。</translation> <translation>'{0}' を最近のプロジェクトリストから削除しますか？　プロジェクトファイルは削除されません。</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="369" /> <location filename="../novelwriter/tools/welcome.py" line="370" />
<source>Open Project</source> <source>Open Project</source>
<translation>プロジェクトを開く</translation> <translation>プロジェクトを開く</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="371" /> <location filename="../novelwriter/tools/welcome.py" line="372" />
<source>Remove Project</source> <source>Remove Project</source>
<translation>プロジェクトを削除</translation> <translation>プロジェクトを削除</translation>
</message> </message>
@@ -4362,12 +4361,12 @@
<context> <context>
<name>_ProjectListModel</name> <name>_ProjectListModel</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="454" /> <location filename="../novelwriter/tools/welcome.py" line="455" />
<source>Word Count</source> <source>Word Count</source>
<translation>単語カウント</translation> <translation>単語カウント</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="455" /> <location filename="../novelwriter/tools/welcome.py" line="456" />
<source>Last Opened</source> <source>Last Opened</source>
<translation>最後に開いた</translation> <translation>最後に開いた</translation>
</message> </message>
i18n/nw_nl_NL.ts
+48 -49
View File
@@ -1313,6 +1313,11 @@
<source>novelWriter is ready ...</source> <source>novelWriter is ready ...</source>
<translation>novelWriter is klaar ...</translation> <translation>novelWriter is klaar ...</translation>
</message> </message>
<message>
<location filename="../novelwriter/guimain.py" line="357" />
<source>You are now running novelWriter version {0}.</source>
<translation>U gebruikt nu novelWriter versie {0}.</translation>
</message>
<message> <message>
<location filename="../novelwriter/guimain.py" line="360" /> <location filename="../novelwriter/guimain.py" line="360" />
<source>Please check the {0}release notes{1} for further details.</source> <source>Please check the {0}release notes{1} for further details.</source>
@@ -3175,37 +3180,37 @@
<context> <context>
<name>GuiWelcome</name> <name>GuiWelcome</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="67" /> <location filename="../novelwriter/tools/welcome.py" line="68" />
<source>Welcome</source> <source>Welcome</source>
<translation>Welkom</translation> <translation>Welkom</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="109" /> <location filename="../novelwriter/tools/welcome.py" line="110" />
<source>List</source> <source>List</source>
<translation>Lijst</translation> <translation>Lijst</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="113" /> <location filename="../novelwriter/tools/welcome.py" line="114" />
<source>New</source> <source>New</source>
<translation>Nieuw</translation> <translation>Nieuw</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="117" /> <location filename="../novelwriter/tools/welcome.py" line="118" />
<source>Browse</source> <source>Browse</source>
<translation>Blader</translation> <translation>Blader</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="121" /> <location filename="../novelwriter/tools/welcome.py" line="122" />
<source>Cancel</source> <source>Cancel</source>
<translation>Annuleer</translation> <translation>Annuleer</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="125" /> <location filename="../novelwriter/tools/welcome.py" line="126" />
<source>Create</source> <source>Create</source>
<translation>Creëren</translation> <translation>Creëren</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="129" /> <location filename="../novelwriter/tools/welcome.py" line="130" />
<source>Open</source> <source>Open</source>
<translation>Openen</translation> <translation>Openen</translation>
</message> </message>
@@ -4119,123 +4124,117 @@
<context> <context>
<name>_NewProjectForm</name> <name>_NewProjectForm</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="569" /> <location filename="../novelwriter/tools/welcome.py" line="570" />
<source>Required</source> <source>Required</source>
<translation>Vereist</translation> <translation>Vereist</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="575" /> <location filename="../novelwriter/tools/welcome.py" line="576" />
<source>Optional</source> <source>Optional</source>
<translation>Optioneel</translation> <translation>Optioneel</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="598" /> <location filename="../novelwriter/tools/welcome.py" line="599" />
<source>Create a fresh project</source> <source>Create a fresh project</source>
<translation>Maak een nieuw project aan</translation> <translation>Maak een nieuw project aan</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="602" /> <location filename="../novelwriter/tools/welcome.py" line="603" />
<source>Create an example project</source> <source>Create an example project</source>
<translation>Maak een voorbeeldproject aan</translation> <translation>Maak een voorbeeldproject aan</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="606" /> <location filename="../novelwriter/tools/welcome.py" line="607" />
<source>Copy an existing project</source> <source>Copy an existing project</source>
<translation>Een bestaand project kopiëren</translation> <translation>Een bestaand project kopiëren</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="620" /> <location filename="../novelwriter/tools/welcome.py" line="621" />
<source>Project Name</source> <source>Project Name</source>
<translation>Projectnaam</translation> <translation>Projectnaam</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="621" /> <location filename="../novelwriter/tools/welcome.py" line="622" />
<source>Author</source> <source>Author</source>
<translation>Auteur</translation> <translation>Auteur</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="622" /> <location filename="../novelwriter/tools/welcome.py" line="623" />
<source>Project Path</source> <source>Project Path</source>
<translation>Project pad</translation> <translation>Project pad</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="623" /> <location filename="../novelwriter/tools/welcome.py" line="624" />
<source>Prefill Project</source> <source>Prefill Project</source>
<translation>Vulling Project</translation> <translation>Vulling Project</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="631" /> <location filename="../novelwriter/tools/welcome.py" line="632" />
<source>Set to 0 to only add scenes</source> <source>Set to 0 to only add scenes</source>
<translation>Stel in op 0 om alleen scènes toe te voegen</translation> <translation>Stel in op 0 om alleen scènes toe te voegen</translation>
</message> </message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="635" />
<source>Add {0} chapter documents</source>
<translation>Voeg {0} hoofdstuk documenten toe</translation>
</message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="644" /> <location filename="../novelwriter/tools/welcome.py" line="644" />
<location filename="../novelwriter/tools/welcome.py" line="634" /> <source>Add {0} scene documents (to each chapter)</source>
<source>Add</source> <translation>Voeg {0} scène documenten toe (aan elk hoofdstuk)</translation>
<translation>Voeg toe</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="636" /> <location filename="../novelwriter/tools/welcome.py" line="672" />
<source>chapter documents</source>
<translation>hoofdstuk documenten</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="646" />
<source>scene documents (to each chapter)</source>
<translation>scène-documenten (voor elk hoofdstuk)</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="673" />
<source>Add a folder for plot notes</source> <source>Add a folder for plot notes</source>
<translation>Voeg een map toe voor plot notities</translation> <translation>Voeg een map toe voor plot notities</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="674" /> <location filename="../novelwriter/tools/welcome.py" line="673" />
<source>Add a folder for character notes</source> <source>Add a folder for character notes</source>
<translation>Voeg een map toe voor karakter notities</translation> <translation>Voeg een map toe voor karakter notities</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="675" /> <location filename="../novelwriter/tools/welcome.py" line="674" />
<source>Add a folder for location notes</source> <source>Add a folder for location notes</source>
<translation>Voeg een map toe voor locatie notities</translation> <translation>Voeg een map toe voor locatie notities</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="676" /> <location filename="../novelwriter/tools/welcome.py" line="675" />
<source>Add example notes to the above</source> <source>Add example notes to the above</source>
<translation>Voeg voorbeeld notities toe aan bovenstaand</translation> <translation>Voeg voorbeeld notities toe aan bovenstaand</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="682" /> <location filename="../novelwriter/tools/welcome.py" line="681" />
<source>Chapters and Scenes</source> <source>Chapters and Scenes</source>
<translation>Hoofdstukken en scènes</translation> <translation>Hoofdstukken en scènes</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="685" /> <location filename="../novelwriter/tools/welcome.py" line="684" />
<source>Project Notes</source> <source>Project Notes</source>
<translation>Projectnotities</translation> <translation>Projectnotities</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="694" /> <location filename="../novelwriter/tools/welcome.py" line="693" />
<source>Create New Project</source> <source>Create New Project</source>
<translation>Nieuw Project Maken</translation> <translation>Nieuw Project Maken</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="737" /> <location filename="../novelwriter/tools/welcome.py" line="736" />
<source>Select Project Folder</source> <source>Select Project Folder</source>
<translation>Selecteer Projectmap</translation> <translation>Selecteer Projectmap</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="793" /> <location filename="../novelwriter/tools/welcome.py" line="792" />
<source>Fresh Project</source> <source>Fresh Project</source>
<translation>Nieuw project</translation> <translation>Nieuw project</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="795" /> <location filename="../novelwriter/tools/welcome.py" line="794" />
<source>Example Project</source> <source>Example Project</source>
<translation>Voorbeeld project</translation> <translation>Voorbeeld project</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="797" /> <location filename="../novelwriter/tools/welcome.py" line="796" />
<source>Template: {0}</source> <source>Template: {0}</source>
<translation>Sjabloon: {0}</translation> <translation>Sjabloon: {0}</translation>
</message> </message>
@@ -4243,7 +4242,7 @@
<context> <context>
<name>_NewProjectPage</name> <name>_NewProjectPage</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="537" /> <location filename="../novelwriter/tools/welcome.py" line="538" />
<source>A project name is required.</source> <source>A project name is required.</source>
<translation>Een projectnaam is vereist.</translation> <translation>Een projectnaam is vereist.</translation>
</message> </message>
@@ -4251,27 +4250,27 @@
<context> <context>
<name>_OpenProjectPage</name> <name>_OpenProjectPage</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="288" /> <location filename="../novelwriter/tools/welcome.py" line="289" />
<source>The project path is not reachable.</source> <source>The project path is not reachable.</source>
<translation>Project pad is niet bereikbaar.</translation> <translation>Project pad is niet bereikbaar.</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="335" /> <location filename="../novelwriter/tools/welcome.py" line="336" />
<source>Path</source> <source>Path</source>
<translation>Pad</translation> <translation>Pad</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="355" /> <location filename="../novelwriter/tools/welcome.py" line="356" />
<source>Remove '{0}' from the recent projects list? The project files will not be deleted.</source> <source>Remove '{0}' from the recent projects list? The project files will not be deleted.</source>
<translation>'{0}' uit de lijst met recente projecten verwijderen? De project bestanden zullen niet worden verwijderd.</translation> <translation>'{0}' uit de lijst met recente projecten verwijderen? De project bestanden zullen niet worden verwijderd.</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="369" /> <location filename="../novelwriter/tools/welcome.py" line="370" />
<source>Open Project</source> <source>Open Project</source>
<translation>Project openen</translation> <translation>Project openen</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="371" /> <location filename="../novelwriter/tools/welcome.py" line="372" />
<source>Remove Project</source> <source>Remove Project</source>
<translation>Project verwijderen</translation> <translation>Project verwijderen</translation>
</message> </message>
@@ -4362,12 +4361,12 @@
<context> <context>
<name>_ProjectListModel</name> <name>_ProjectListModel</name>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="454" /> <location filename="../novelwriter/tools/welcome.py" line="455" />
<source>Word Count</source> <source>Word Count</source>
<translation>Woord Telling</translation> <translation>Woord Telling</translation>
</message> </message>
<message> <message>
<location filename="../novelwriter/tools/welcome.py" line="455" /> <location filename="../novelwriter/tools/welcome.py" line="456" />
<source>Last Opened</source> <source>Last Opened</source>
<translation>Laatst geopend</translation> <translation>Laatst geopend</translation>
</message> </message>
novelwriter/constants.py
+4 -1
View File
@@ -322,8 +322,11 @@ class nwHeadFmt:
CHAR_POV, CHAR_FOCUS CHAR_POV, CHAR_FOCUS
] ]
# ODT Document Header Page Counter # ODT Document Page Header
ODT_PROJECT = "{Project}"
ODT_AUTHOR = "{Author}"
ODT_PAGE = "{Page}" ODT_PAGE = "{Page}"
ODT_AUTO = "{Project} / {Author} / {Page}"
# END Class nwHeadFmt # END Class nwHeadFmt
novelwriter/core/buildsettings.py
+2 -2
View File
@@ -91,7 +91,7 @@ SETTINGS_TEMPLATE = {
"format.leftMargin": (float, 2.0), "format.leftMargin": (float, 2.0),
"format.rightMargin": (float, 2.0), "format.rightMargin": (float, 2.0),
"odt.addColours": (bool, True), "odt.addColours": (bool, True),
"odt.pageHeaderText": (str, nwHeadFmt.ODT_PAGE), "odt.pageHeader": (str, nwHeadFmt.ODT_AUTO),
"odt.pageCountOffset": (int, 0), "odt.pageCountOffset": (int, 0),
"odt.firstLineIndent": (bool, False), "odt.firstLineIndent": (bool, False),
"md.preserveBreaks": (bool, True), "md.preserveBreaks": (bool, True),
@@ -142,7 +142,7 @@ SETTINGS_LABELS = {
"odt": QT_TRANSLATE_NOOP("Builds", "Open Document (.odt)"), "odt": QT_TRANSLATE_NOOP("Builds", "Open Document (.odt)"),
"odt.addColours": QT_TRANSLATE_NOOP("Builds", "Add Highlight Colours"), "odt.addColours": QT_TRANSLATE_NOOP("Builds", "Add Highlight Colours"),
"odt.pageHeaderText": QT_TRANSLATE_NOOP("Builds", "Page Header"), "odt.pageHeader": QT_TRANSLATE_NOOP("Builds", "Page Header"),
"odt.pageCountOffset": QT_TRANSLATE_NOOP("Builds", "Page Counter Offset"), "odt.pageCountOffset": QT_TRANSLATE_NOOP("Builds", "Page Counter Offset"),
"odt.firstLineIndent": QT_TRANSLATE_NOOP("Builds", "First Line Indent"), "odt.firstLineIndent": QT_TRANSLATE_NOOP("Builds", "First Line Indent"),
novelwriter/core/docbuild.py
+1 -1
View File
@@ -330,7 +330,7 @@ class NWBuildDocument:
bldObj.setColourHeaders(self._build.getBool("odt.addColours")) bldObj.setColourHeaders(self._build.getBool("odt.addColours"))
bldObj.setLanguage(self._project.data.language) bldObj.setLanguage(self._project.data.language)
bldObj.setHeaderFormat( bldObj.setHeaderFormat(
self._build.getStr("odt.pageHeaderText"), self._build.getInt("odt.pageCountOffset") self._build.getStr("odt.pageHeader"), self._build.getInt("odt.pageCountOffset")
) )
bldObj.setFirstLineIndent(self._build.getBool("odt.firstLineIndent")) bldObj.setFirstLineIndent(self._build.getBool("odt.firstLineIndent"))
novelwriter/core/toodt.py
+6
View File
@@ -1048,6 +1048,12 @@ class ToOdt(Tokenizer):
# Standard Page Header # Standard Page Header
if self._headerFormat: if self._headerFormat:
pre, page, post = self._headerFormat.partition(nwHeadFmt.ODT_PAGE) pre, page, post = self._headerFormat.partition(nwHeadFmt.ODT_PAGE)
pre = pre.replace(nwHeadFmt.ODT_PROJECT, self._project.data.name)
pre = pre.replace(nwHeadFmt.ODT_AUTHOR, self._project.data.author)
post = post.replace(nwHeadFmt.ODT_PROJECT, self._project.data.name)
post = post.replace(nwHeadFmt.ODT_AUTHOR, self._project.data.author)
xHead = ET.SubElement(xPage, _mkTag("style", "header")) xHead = ET.SubElement(xPage, _mkTag("style", "header"))
xPar = ET.SubElement(xHead, _mkTag("text", "p"), attrib={ xPar = ET.SubElement(xHead, _mkTag("text", "p"), attrib={
_mkTag("text", "style-name"): "Header" _mkTag("text", "style-name"): "Header"
novelwriter/tools/manussettings.py
+5 -7
View File
@@ -1352,8 +1352,8 @@ class _OutputTab(NScrollableForm):
self.btnPageHeader.setIcon(SHARED.theme.getIcon("revert")) self.btnPageHeader.setIcon(SHARED.theme.getIcon("revert"))
self.btnPageHeader.clicked.connect(self._resetPageHeader) self.btnPageHeader.clicked.connect(self._resetPageHeader)
self.addRow( self.addRow(
self._build.getLabel("odt.pageHeaderText"), self.odtPageHeader, self._build.getLabel("odt.pageHeader"), self.odtPageHeader,
button=self.btnPageHeader, stretch=(2, 3) button=self.btnPageHeader, stretch=(1, 1)
) )
self.odtPageCountOffset = NSpinBox(self) self.odtPageCountOffset = NSpinBox(self)
@@ -1389,7 +1389,7 @@ class _OutputTab(NScrollableForm):
def loadContent(self) -> None: def loadContent(self) -> None:
"""Populate the widgets.""" """Populate the widgets."""
self.odtAddColours.setChecked(self._build.getBool("odt.addColours")) self.odtAddColours.setChecked(self._build.getBool("odt.addColours"))
self.odtPageHeader.setText(self._build.getStr("odt.pageHeaderText")) self.odtPageHeader.setText(self._build.getStr("odt.pageHeader"))
self.odtPageCountOffset.setValue(self._build.getInt("odt.pageCountOffset")) self.odtPageCountOffset.setValue(self._build.getInt("odt.pageCountOffset"))
self.odtFirstLineIndent.setChecked(self._build.getBool("odt.firstLineIndent")) self.odtFirstLineIndent.setChecked(self._build.getBool("odt.firstLineIndent"))
self.htmlAddStyles.setChecked(self._build.getBool("html.addStyles")) self.htmlAddStyles.setChecked(self._build.getBool("html.addStyles"))
@@ -1400,7 +1400,7 @@ class _OutputTab(NScrollableForm):
def saveContent(self) -> None: def saveContent(self) -> None:
"""Save choices back into build object.""" """Save choices back into build object."""
self._build.setValue("odt.addColours", self.odtAddColours.isChecked()) self._build.setValue("odt.addColours", self.odtAddColours.isChecked())
self._build.setValue("odt.pageHeaderText", self.odtPageHeader.text()) self._build.setValue("odt.pageHeader", self.odtPageHeader.text())
self._build.setValue("odt.pageCountOffset", self.odtPageCountOffset.value()) self._build.setValue("odt.pageCountOffset", self.odtPageCountOffset.value())
self._build.setValue("odt.firstLineIndent", self.odtFirstLineIndent.isChecked()) self._build.setValue("odt.firstLineIndent", self.odtFirstLineIndent.isChecked())
self._build.setValue("html.addStyles", self.htmlAddStyles.isChecked()) self._build.setValue("html.addStyles", self.htmlAddStyles.isChecked())
@@ -1414,9 +1414,7 @@ class _OutputTab(NScrollableForm):
def _resetPageHeader(self) -> None: def _resetPageHeader(self) -> None:
"""Reset the ODT header format to default.""" """Reset the ODT header format to default."""
self.odtPageHeader.setText(" / ".join(filter(bool, [ self.odtPageHeader.setText(nwHeadFmt.ODT_AUTO)
SHARED.project.data.name, SHARED.project.data.author, nwHeadFmt.ODT_PAGE
])))
self.odtPageHeader.setCursorPosition(0) self.odtPageHeader.setCursorPosition(0)
return return
tests/reference/coreToOdt_SaveFlat_document.fodt
+1 -1
View File
@@ -79,7 +79,7 @@
<office:master-styles> <office:master-styles>
<style:master-page style:name="Standard" style:page-layout-name="PM1"> <style:master-page style:name="Standard" style:page-layout-name="PM1">
<style:header> <style:header>
<text:p text:style-name="Header"><text:page-number text:page-adjust="-1">2</text:page-number></text:p> <text:p text:style-name="Header">Test Project / Jane Smith / <text:page-number text:page-adjust="-1">2</text:page-number></text:p>
</style:header> </style:header>
<style:header-first> <style:header-first>
<text:p text:style-name="Header" /> <text:p text:style-name="Header" />
tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt
+1 -1
View File
@@ -103,7 +103,7 @@
<office:master-styles> <office:master-styles>
<style:master-page style:name="Standard" style:page-layout-name="PM1"> <style:master-page style:name="Standard" style:page-layout-name="PM1">
<style:header> <style:header>
<text:p text:style-name="Header"><text:page-number text:select-page="current">2</text:page-number></text:p> <text:p text:style-name="Header">Lorem Ipsum / lipsum.com / <text:page-number text:select-page="current">2</text:page-number></text:p>
</style:header> </style:header>
<style:header-first> <style:header-first>
<text:p text:style-name="Header" /> <text:p text:style-name="Header" />
tests/test_core/test_core_toodt.py
+3 -3
View File
@@ -711,8 +711,8 @@ def testCoreToOdt_SaveFlat(mockGUI, fncPath, tstPaths):
assert odt._dLanguage == "nb" assert odt._dLanguage == "nb"
odt.setColourHeaders(True) odt.setColourHeaders(True)
assert odt._colourHead is True assert odt._colourHead is True
odt.setHeaderFormat(nwHeadFmt.ODT_PAGE, 1) odt.setHeaderFormat(nwHeadFmt.ODT_AUTO, 1)
assert odt._headerFormat == nwHeadFmt.ODT_PAGE assert odt._headerFormat == nwHeadFmt.ODT_AUTO
odt.setPageLayout(148, 210, 20, 18, 17, 15) odt.setPageLayout(148, 210, 20, 18, 17, 15)
assert odt._mDocWidth == "14.800cm" assert odt._mDocWidth == "14.800cm"
@@ -759,7 +759,7 @@ def testCoreToOdt_SaveFull(mockGUI, fncPath, tstPaths):
odt._isNovel = True odt._isNovel = True
# Set a format without page number # Set a format without page number
odt.setHeaderFormat("Test Project - Jane Smith", 0) odt.setHeaderFormat(f"{nwHeadFmt.ODT_PROJECT} - {nwHeadFmt.ODT_AUTHOR}", 0)
odt._text = ( odt._text = (
"## Chapter One\n\n" "## Chapter One\n\n"
tests/test_tools/test_tools_manussettings.py
+3 -4
View File
@@ -673,7 +673,7 @@ def testBuildSettings_Output(qtbot: QtBot, nwGUI: GuiMain):
# Check initial values # Check initial values
assert outTab.odtAddColours.isChecked() is False assert outTab.odtAddColours.isChecked() is False
assert outTab.odtPageHeader.text() == nwHeadFmt.ODT_PAGE assert outTab.odtPageHeader.text() == nwHeadFmt.ODT_AUTO
assert outTab.odtPageCountOffset.value() == 0 assert outTab.odtPageCountOffset.value() == 0
assert outTab.odtFirstLineIndent.isChecked() is False assert outTab.odtFirstLineIndent.isChecked() is False
assert outTab.htmlAddStyles.isChecked() is False assert outTab.htmlAddStyles.isChecked() is False
@@ -695,7 +695,7 @@ def testBuildSettings_Output(qtbot: QtBot, nwGUI: GuiMain):
outTab.saveContent() outTab.saveContent()
assert build.getBool("odt.addColours") is True assert build.getBool("odt.addColours") is True
assert build.getStr("odt.pageHeaderText") == "Stuff" assert build.getStr("odt.pageHeader") == "Stuff"
assert build.getInt("odt.pageCountOffset") == 1 assert build.getInt("odt.pageCountOffset") == 1
assert build.getBool("odt.firstLineIndent") is True assert build.getBool("odt.firstLineIndent") is True
assert build.getBool("html.addStyles") is True assert build.getBool("html.addStyles") is True
@@ -703,9 +703,8 @@ def testBuildSettings_Output(qtbot: QtBot, nwGUI: GuiMain):
assert build.getBool("md.preserveBreaks") is False assert build.getBool("md.preserveBreaks") is False
# Reset header format # Reset header format
SHARED.project.data.setName("Test Project")
outTab.btnPageHeader.click() outTab.btnPageHeader.click()
assert outTab.odtPageHeader.text() == f"Test Project / {nwHeadFmt.ODT_PAGE}" assert outTab.odtPageHeader.text() == nwHeadFmt.ODT_AUTO
# Finish # Finish
bSettings._dialogButtonClicked(bSettings.buttonBox.button(QDialogButtonBox.Close)) bSettings._dialogButtonClicked(bSettings.buttonBox.button(QDialogButtonBox.Close))