Merge branch 'main' into dev

This commit is contained in:
Veronica Berglyd Olsen
2024-03-17 11:56:34 +01:00
16 changed files with 1973 additions and 2076 deletions
+27
View File
@@ -1,5 +1,32 @@
# 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]
### Release Notes
+38 -38
View File
@@ -3180,37 +3180,37 @@
<context>
<name>GuiWelcome</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="67" />
<location filename="../novelwriter/tools/welcome.py" line="68" />
<source>Welcome</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="109" />
<location filename="../novelwriter/tools/welcome.py" line="110" />
<source>List</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="113" />
<location filename="../novelwriter/tools/welcome.py" line="114" />
<source>New</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="117" />
<location filename="../novelwriter/tools/welcome.py" line="118" />
<source>Browse</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="121" />
<location filename="../novelwriter/tools/welcome.py" line="122" />
<source>Cancel</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="125" />
<location filename="../novelwriter/tools/welcome.py" line="126" />
<source>Create</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="129" />
<location filename="../novelwriter/tools/welcome.py" line="130" />
<source>Open</source>
<translation type="unfinished" />
</message>
@@ -4124,117 +4124,117 @@
<context>
<name>_NewProjectForm</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="569" />
<location filename="../novelwriter/tools/welcome.py" line="570" />
<source>Required</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="575" />
<location filename="../novelwriter/tools/welcome.py" line="576" />
<source>Optional</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="598" />
<location filename="../novelwriter/tools/welcome.py" line="599" />
<source>Create a fresh project</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="602" />
<location filename="../novelwriter/tools/welcome.py" line="603" />
<source>Create an example project</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="606" />
<location filename="../novelwriter/tools/welcome.py" line="607" />
<source>Copy an existing project</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="620" />
<location filename="../novelwriter/tools/welcome.py" line="621" />
<source>Project Name</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="621" />
<location filename="../novelwriter/tools/welcome.py" line="622" />
<source>Author</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="622" />
<location filename="../novelwriter/tools/welcome.py" line="623" />
<source>Project Path</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="623" />
<location filename="../novelwriter/tools/welcome.py" line="624" />
<source>Prefill Project</source>
<translation type="unfinished" />
</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>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="633" />
<location filename="../novelwriter/tools/welcome.py" line="635" />
<source>Add {0} chapter documents</source>
<translation type="unfinished" />
</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>
<translation type="unfinished" />
</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>
<translation type="unfinished" />
</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>
<translation type="unfinished" />
</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>
<translation type="unfinished" />
</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>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="689" />
<location filename="../novelwriter/tools/welcome.py" line="681" />
<source>Chapters and Scenes</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="692" />
<location filename="../novelwriter/tools/welcome.py" line="684" />
<source>Project Notes</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="701" />
<location filename="../novelwriter/tools/welcome.py" line="693" />
<source>Create New Project</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="744" />
<location filename="../novelwriter/tools/welcome.py" line="736" />
<source>Select Project Folder</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="800" />
<location filename="../novelwriter/tools/welcome.py" line="792" />
<source>Fresh Project</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="802" />
<location filename="../novelwriter/tools/welcome.py" line="794" />
<source>Example Project</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="804" />
<location filename="../novelwriter/tools/welcome.py" line="796" />
<source>Template: {0}</source>
<translation type="unfinished" />
</message>
@@ -4242,7 +4242,7 @@
<context>
<name>_NewProjectPage</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="537" />
<location filename="../novelwriter/tools/welcome.py" line="538" />
<source>A project name is required.</source>
<translation type="unfinished" />
</message>
@@ -4250,27 +4250,27 @@
<context>
<name>_OpenProjectPage</name>
<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>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="335" />
<location filename="../novelwriter/tools/welcome.py" line="336" />
<source>Path</source>
<translation type="unfinished" />
</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>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="369" />
<location filename="../novelwriter/tools/welcome.py" line="370" />
<source>Open Project</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="371" />
<location filename="../novelwriter/tools/welcome.py" line="372" />
<source>Remove Project</source>
<translation type="unfinished" />
</message>
@@ -4361,12 +4361,12 @@
<context>
<name>_ProjectListModel</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="454" />
<location filename="../novelwriter/tools/welcome.py" line="455" />
<source>Word Count</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="455" />
<location filename="../novelwriter/tools/welcome.py" line="456" />
<source>Last Opened</source>
<translation type="unfinished" />
</message>
+49 -50
View File
@@ -1313,6 +1313,11 @@
<source>novelWriter is ready ...</source>
<translation>novelWriter ya está listo...</translation>
</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>
<location filename="../novelwriter/guimain.py" line="360" />
<source>Please check the {0}release notes{1} for further details.</source>
@@ -3175,37 +3180,37 @@
<context>
<name>GuiWelcome</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="67" />
<location filename="../novelwriter/tools/welcome.py" line="68" />
<source>Welcome</source>
<translation>Bienvenida</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="109" />
<location filename="../novelwriter/tools/welcome.py" line="110" />
<source>List</source>
<translation>Lista</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="113" />
<location filename="../novelwriter/tools/welcome.py" line="114" />
<source>New</source>
<translation>Nuevo</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="117" />
<location filename="../novelwriter/tools/welcome.py" line="118" />
<source>Browse</source>
<translation>Abrir ubicación</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="121" />
<location filename="../novelwriter/tools/welcome.py" line="122" />
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="125" />
<location filename="../novelwriter/tools/welcome.py" line="126" />
<source>Create</source>
<translation>Crear</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="129" />
<location filename="../novelwriter/tools/welcome.py" line="130" />
<source>Open</source>
<translation>Abrir</translation>
</message>
@@ -4119,123 +4124,117 @@
<context>
<name>_NewProjectForm</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="569" />
<location filename="../novelwriter/tools/welcome.py" line="570" />
<source>Required</source>
<translation>Requerido</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="575" />
<location filename="../novelwriter/tools/welcome.py" line="576" />
<source>Optional</source>
<translation>Opcional</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="598" />
<location filename="../novelwriter/tools/welcome.py" line="599" />
<source>Create a fresh project</source>
<translation>Crear un nuevo proyecto</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="602" />
<location filename="../novelwriter/tools/welcome.py" line="603" />
<source>Create an example project</source>
<translation>Crear un ejemplo de proyecto</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="606" />
<location filename="../novelwriter/tools/welcome.py" line="607" />
<source>Copy an existing project</source>
<translation>Copiar un proyecto existente</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="620" />
<location filename="../novelwriter/tools/welcome.py" line="621" />
<source>Project Name</source>
<translation>Nombre del Proyecto</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="621" />
<location filename="../novelwriter/tools/welcome.py" line="622" />
<source>Author</source>
<translation>Autor(es)</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="622" />
<location filename="../novelwriter/tools/welcome.py" line="623" />
<source>Project Path</source>
<translation>Ruta del Proyecto</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="623" />
<location filename="../novelwriter/tools/welcome.py" line="624" />
<source>Prefill Project</source>
<translation>Rellenar el Proyecto</translation>
</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>
<translation>Escoger 0 para solo añadir escenas</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="635" />
<source>Add {0} chapter documents</source>
<translation>Incluir {0} capítulos</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="644" />
<location filename="../novelwriter/tools/welcome.py" line="634" />
<source>Add</source>
<translation>Añadir</translation>
<source>Add {0} scene documents (to each chapter)</source>
<translation>Incluir {0} escenas (a cada capítulo)</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="636" />
<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" />
<location filename="../novelwriter/tools/welcome.py" line="672" />
<source>Add a folder for plot notes</source>
<translation>Añadir una carpeta para notas argumentales</translation>
</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>
<translation>Añadir una carpeta para notas sobre los personajes</translation>
</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>
<translation>Añadir una carpeta para notas acerca de los lugares</translation>
</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>
<translation>Añadir ejemplos de notas</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="682" />
<location filename="../novelwriter/tools/welcome.py" line="681" />
<source>Chapters and Scenes</source>
<translation>Capítulos y Escenas</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="685" />
<location filename="../novelwriter/tools/welcome.py" line="684" />
<source>Project Notes</source>
<translation>Notas del Proyecto</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="694" />
<location filename="../novelwriter/tools/welcome.py" line="693" />
<source>Create New Project</source>
<translation>Crear un Proyecto Nuevo</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="737" />
<location filename="../novelwriter/tools/welcome.py" line="736" />
<source>Select Project Folder</source>
<translation>Escoger la Carpeta del Proyecto</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="793" />
<location filename="../novelwriter/tools/welcome.py" line="792" />
<source>Fresh Project</source>
<translation>Proyecto vacío</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="795" />
<location filename="../novelwriter/tools/welcome.py" line="794" />
<source>Example Project</source>
<translation>Ejemplo de Proyecto</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="797" />
<location filename="../novelwriter/tools/welcome.py" line="796" />
<source>Template: {0}</source>
<translation>Plantilla: {0}</translation>
</message>
@@ -4243,7 +4242,7 @@
<context>
<name>_NewProjectPage</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="537" />
<location filename="../novelwriter/tools/welcome.py" line="538" />
<source>A project name is required.</source>
<translation>Se requiere un nombre de proyecto.</translation>
</message>
@@ -4251,27 +4250,27 @@
<context>
<name>_OpenProjectPage</name>
<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>
<translation>No se puede acceder a la ruta del proyecto.</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="335" />
<location filename="../novelwriter/tools/welcome.py" line="336" />
<source>Path</source>
<translation>Ruta</translation>
</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>
<translation>¿Eliminar '{0}' de la lista de proyectos recientes? Los archivos del proyecto no se eliminarán.</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="369" />
<location filename="../novelwriter/tools/welcome.py" line="370" />
<source>Open Project</source>
<translation>Abrir un Proyecto</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="371" />
<location filename="../novelwriter/tools/welcome.py" line="372" />
<source>Remove Project</source>
<translation>Eliminar Proyecto</translation>
</message>
@@ -4362,14 +4361,14 @@
<context>
<name>_ProjectListModel</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="454" />
<location filename="../novelwriter/tools/welcome.py" line="455" />
<source>Word Count</source>
<translation>Total de Palabras</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="455" />
<location filename="../novelwriter/tools/welcome.py" line="456" />
<source>Last Opened</source>
<translation>Abierto por Última Vez</translation>
<translation>Abierto por última vez</translation>
</message>
</context>
<context>
+1689 -1821
View File
File diff suppressed because it is too large Load Diff
+48 -49
View File
@@ -1313,6 +1313,11 @@
<source>novelWriter is ready ...</source>
<translation>novelWriter è pronto...</translation>
</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>
<location filename="../novelwriter/guimain.py" line="360" />
<source>Please check the {0}release notes{1} for further details.</source>
@@ -3175,37 +3180,37 @@
<context>
<name>GuiWelcome</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="67" />
<location filename="../novelwriter/tools/welcome.py" line="68" />
<source>Welcome</source>
<translation>Benvenuto/a</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="109" />
<location filename="../novelwriter/tools/welcome.py" line="110" />
<source>List</source>
<translation>Elenco</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="113" />
<location filename="../novelwriter/tools/welcome.py" line="114" />
<source>New</source>
<translation>Nuovo</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="117" />
<location filename="../novelwriter/tools/welcome.py" line="118" />
<source>Browse</source>
<translation>Sfoglia</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="121" />
<location filename="../novelwriter/tools/welcome.py" line="122" />
<source>Cancel</source>
<translation>Cancella</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="125" />
<location filename="../novelwriter/tools/welcome.py" line="126" />
<source>Create</source>
<translation>Crea</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="129" />
<location filename="../novelwriter/tools/welcome.py" line="130" />
<source>Open</source>
<translation>Apri</translation>
</message>
@@ -4119,123 +4124,117 @@
<context>
<name>_NewProjectForm</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="569" />
<location filename="../novelwriter/tools/welcome.py" line="570" />
<source>Required</source>
<translation>Necessario</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="575" />
<location filename="../novelwriter/tools/welcome.py" line="576" />
<source>Optional</source>
<translation>Facoltativo</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="598" />
<location filename="../novelwriter/tools/welcome.py" line="599" />
<source>Create a fresh project</source>
<translation>Crea un nuovo progetto</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="602" />
<location filename="../novelwriter/tools/welcome.py" line="603" />
<source>Create an example project</source>
<translation>Crea un progetto di esempio</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="606" />
<location filename="../novelwriter/tools/welcome.py" line="607" />
<source>Copy an existing project</source>
<translation>Copia un progetto esistente</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="620" />
<location filename="../novelwriter/tools/welcome.py" line="621" />
<source>Project Name</source>
<translation>Nome del progetto</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="621" />
<location filename="../novelwriter/tools/welcome.py" line="622" />
<source>Author</source>
<translation>Autore</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="622" />
<location filename="../novelwriter/tools/welcome.py" line="623" />
<source>Project Path</source>
<translation>Percorso del progetto</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="623" />
<location filename="../novelwriter/tools/welcome.py" line="624" />
<source>Prefill Project</source>
<translation>Tipo di progetto</translation>
</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>
<translation>Imposta a 0 per aggiungere solo scene</translation>
</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>
<location filename="../novelwriter/tools/welcome.py" line="644" />
<location filename="../novelwriter/tools/welcome.py" line="634" />
<source>Add</source>
<translation>Aggiungi</translation>
<source>Add {0} scene documents (to each chapter)</source>
<translation>Aggiungi {0} scene come documenti (a ogni capitolo)</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="636" />
<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" />
<location filename="../novelwriter/tools/welcome.py" line="672" />
<source>Add a folder for plot notes</source>
<translation>Aggiungi una cartella per le note sulla trama</translation>
</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>
<translation>Aggiungi una cartella per le note sui personaggi</translation>
</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>
<translation>Aggiungi una cartella per le note sulle località</translation>
</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>
<translation>Aggiungi note di esempio alle precedenti</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="682" />
<location filename="../novelwriter/tools/welcome.py" line="681" />
<source>Chapters and Scenes</source>
<translation>Capitoli e scene</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="685" />
<location filename="../novelwriter/tools/welcome.py" line="684" />
<source>Project Notes</source>
<translation>Note del progetto</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="694" />
<location filename="../novelwriter/tools/welcome.py" line="693" />
<source>Create New Project</source>
<translation>Crea un nuovo progetto</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="737" />
<location filename="../novelwriter/tools/welcome.py" line="736" />
<source>Select Project Folder</source>
<translation>Seleziona la cartella del progetto</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="793" />
<location filename="../novelwriter/tools/welcome.py" line="792" />
<source>Fresh Project</source>
<translation>Nuovo progetto</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="795" />
<location filename="../novelwriter/tools/welcome.py" line="794" />
<source>Example Project</source>
<translation>Progetto di esempio</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="797" />
<location filename="../novelwriter/tools/welcome.py" line="796" />
<source>Template: {0}</source>
<translation>Modello: {0}</translation>
</message>
@@ -4243,7 +4242,7 @@
<context>
<name>_NewProjectPage</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="537" />
<location filename="../novelwriter/tools/welcome.py" line="538" />
<source>A project name is required.</source>
<translation>È richiesto un nome di progetto.</translation>
</message>
@@ -4251,27 +4250,27 @@
<context>
<name>_OpenProjectPage</name>
<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>
<translation>Il percorso del progetto non è raggiungibile.</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="335" />
<location filename="../novelwriter/tools/welcome.py" line="336" />
<source>Path</source>
<translation>Percorso</translation>
</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>
<translation>Rimuovere '{0}' dalla lista dei progetti recenti? I file del progetto non verranno eliminati.</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="369" />
<location filename="../novelwriter/tools/welcome.py" line="370" />
<source>Open Project</source>
<translation>Apri il progetto</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="371" />
<location filename="../novelwriter/tools/welcome.py" line="372" />
<source>Remove Project</source>
<translation>Rimuovi il progetto</translation>
</message>
@@ -4362,12 +4361,12 @@
<context>
<name>_ProjectListModel</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="454" />
<location filename="../novelwriter/tools/welcome.py" line="455" />
<source>Word Count</source>
<translation>Conteggio delle parole</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="455" />
<location filename="../novelwriter/tools/welcome.py" line="456" />
<source>Last Opened</source>
<translation>Ultima apertura</translation>
</message>
+48 -49
View File
@@ -1313,6 +1313,11 @@
<source>novelWriter is ready ...</source>
<translation>novelWriterの準備ができました...</translation>
</message>
<message>
<location filename="../novelwriter/guimain.py" line="357" />
<source>You are now running novelWriter version {0}.</source>
<translation>novelWriter バージョン {0} を実行しています。</translation>
</message>
<message>
<location filename="../novelwriter/guimain.py" line="360" />
<source>Please check the {0}release notes{1} for further details.</source>
@@ -3175,37 +3180,37 @@
<context>
<name>GuiWelcome</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="67" />
<location filename="../novelwriter/tools/welcome.py" line="68" />
<source>Welcome</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="109" />
<location filename="../novelwriter/tools/welcome.py" line="110" />
<source>List</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="113" />
<location filename="../novelwriter/tools/welcome.py" line="114" />
<source>New</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="117" />
<location filename="../novelwriter/tools/welcome.py" line="118" />
<source>Browse</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="121" />
<location filename="../novelwriter/tools/welcome.py" line="122" />
<source>Cancel</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="125" />
<location filename="../novelwriter/tools/welcome.py" line="126" />
<source>Create</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="129" />
<location filename="../novelwriter/tools/welcome.py" line="130" />
<source>Open</source>
<translation></translation>
</message>
@@ -4119,123 +4124,117 @@
<context>
<name>_NewProjectForm</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="569" />
<location filename="../novelwriter/tools/welcome.py" line="570" />
<source>Required</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="575" />
<location filename="../novelwriter/tools/welcome.py" line="576" />
<source>Optional</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="598" />
<location filename="../novelwriter/tools/welcome.py" line="599" />
<source>Create a fresh project</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="602" />
<location filename="../novelwriter/tools/welcome.py" line="603" />
<source>Create an example project</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="606" />
<location filename="../novelwriter/tools/welcome.py" line="607" />
<source>Copy an existing project</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="620" />
<location filename="../novelwriter/tools/welcome.py" line="621" />
<source>Project Name</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="621" />
<location filename="../novelwriter/tools/welcome.py" line="622" />
<source>Author</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="622" />
<location filename="../novelwriter/tools/welcome.py" line="623" />
<source>Project Path</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="623" />
<location filename="../novelwriter/tools/welcome.py" line="624" />
<source>Prefill Project</source>
<translation></translation>
</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>
<translation>0</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="635" />
<source>Add {0} chapter documents</source>
<translation>{0} </translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="644" />
<location filename="../novelwriter/tools/welcome.py" line="634" />
<source>Add</source>
<translation></translation>
<source>Add {0} scene documents (to each chapter)</source>
<translation>{0} ()</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="636" />
<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" />
<location filename="../novelwriter/tools/welcome.py" line="672" />
<source>Add a folder for plot notes</source>
<translation></translation>
</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>
<translation></translation>
</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>
<translation></translation>
</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>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="682" />
<location filename="../novelwriter/tools/welcome.py" line="681" />
<source>Chapters and Scenes</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="685" />
<location filename="../novelwriter/tools/welcome.py" line="684" />
<source>Project Notes</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="694" />
<location filename="../novelwriter/tools/welcome.py" line="693" />
<source>Create New Project</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="737" />
<location filename="../novelwriter/tools/welcome.py" line="736" />
<source>Select Project Folder</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="793" />
<location filename="../novelwriter/tools/welcome.py" line="792" />
<source>Fresh Project</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="795" />
<location filename="../novelwriter/tools/welcome.py" line="794" />
<source>Example Project</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="797" />
<location filename="../novelwriter/tools/welcome.py" line="796" />
<source>Template: {0}</source>
<translation>: {0}</translation>
</message>
@@ -4243,7 +4242,7 @@
<context>
<name>_NewProjectPage</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="537" />
<location filename="../novelwriter/tools/welcome.py" line="538" />
<source>A project name is required.</source>
<translation></translation>
</message>
@@ -4251,27 +4250,27 @@
<context>
<name>_OpenProjectPage</name>
<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>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="335" />
<location filename="../novelwriter/tools/welcome.py" line="336" />
<source>Path</source>
<translation></translation>
</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>
<translation>'{0}'  </translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="369" />
<location filename="../novelwriter/tools/welcome.py" line="370" />
<source>Open Project</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="371" />
<location filename="../novelwriter/tools/welcome.py" line="372" />
<source>Remove Project</source>
<translation></translation>
</message>
@@ -4362,12 +4361,12 @@
<context>
<name>_ProjectListModel</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="454" />
<location filename="../novelwriter/tools/welcome.py" line="455" />
<source>Word Count</source>
<translation></translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="455" />
<location filename="../novelwriter/tools/welcome.py" line="456" />
<source>Last Opened</source>
<translation></translation>
</message>
+48 -49
View File
@@ -1313,6 +1313,11 @@
<source>novelWriter is ready ...</source>
<translation>novelWriter is klaar ...</translation>
</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>
<location filename="../novelwriter/guimain.py" line="360" />
<source>Please check the {0}release notes{1} for further details.</source>
@@ -3175,37 +3180,37 @@
<context>
<name>GuiWelcome</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="67" />
<location filename="../novelwriter/tools/welcome.py" line="68" />
<source>Welcome</source>
<translation>Welkom</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="109" />
<location filename="../novelwriter/tools/welcome.py" line="110" />
<source>List</source>
<translation>Lijst</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="113" />
<location filename="../novelwriter/tools/welcome.py" line="114" />
<source>New</source>
<translation>Nieuw</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="117" />
<location filename="../novelwriter/tools/welcome.py" line="118" />
<source>Browse</source>
<translation>Blader</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="121" />
<location filename="../novelwriter/tools/welcome.py" line="122" />
<source>Cancel</source>
<translation>Annuleer</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="125" />
<location filename="../novelwriter/tools/welcome.py" line="126" />
<source>Create</source>
<translation>Creëren</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="129" />
<location filename="../novelwriter/tools/welcome.py" line="130" />
<source>Open</source>
<translation>Openen</translation>
</message>
@@ -4119,123 +4124,117 @@
<context>
<name>_NewProjectForm</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="569" />
<location filename="../novelwriter/tools/welcome.py" line="570" />
<source>Required</source>
<translation>Vereist</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="575" />
<location filename="../novelwriter/tools/welcome.py" line="576" />
<source>Optional</source>
<translation>Optioneel</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="598" />
<location filename="../novelwriter/tools/welcome.py" line="599" />
<source>Create a fresh project</source>
<translation>Maak een nieuw project aan</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="602" />
<location filename="../novelwriter/tools/welcome.py" line="603" />
<source>Create an example project</source>
<translation>Maak een voorbeeldproject aan</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="606" />
<location filename="../novelwriter/tools/welcome.py" line="607" />
<source>Copy an existing project</source>
<translation>Een bestaand project kopiëren</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="620" />
<location filename="../novelwriter/tools/welcome.py" line="621" />
<source>Project Name</source>
<translation>Projectnaam</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="621" />
<location filename="../novelwriter/tools/welcome.py" line="622" />
<source>Author</source>
<translation>Auteur</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="622" />
<location filename="../novelwriter/tools/welcome.py" line="623" />
<source>Project Path</source>
<translation>Project pad</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="623" />
<location filename="../novelwriter/tools/welcome.py" line="624" />
<source>Prefill Project</source>
<translation>Vulling Project</translation>
</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>
<translation>Stel in op 0 om alleen scènes toe te voegen</translation>
</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>
<location filename="../novelwriter/tools/welcome.py" line="644" />
<location filename="../novelwriter/tools/welcome.py" line="634" />
<source>Add</source>
<translation>Voeg toe</translation>
<source>Add {0} scene documents (to each chapter)</source>
<translation>Voeg {0} scène documenten toe (aan elk hoofdstuk)</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="636" />
<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" />
<location filename="../novelwriter/tools/welcome.py" line="672" />
<source>Add a folder for plot notes</source>
<translation>Voeg een map toe voor plot notities</translation>
</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>
<translation>Voeg een map toe voor karakter notities</translation>
</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>
<translation>Voeg een map toe voor locatie notities</translation>
</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>
<translation>Voeg voorbeeld notities toe aan bovenstaand</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="682" />
<location filename="../novelwriter/tools/welcome.py" line="681" />
<source>Chapters and Scenes</source>
<translation>Hoofdstukken en scènes</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="685" />
<location filename="../novelwriter/tools/welcome.py" line="684" />
<source>Project Notes</source>
<translation>Projectnotities</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="694" />
<location filename="../novelwriter/tools/welcome.py" line="693" />
<source>Create New Project</source>
<translation>Nieuw Project Maken</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="737" />
<location filename="../novelwriter/tools/welcome.py" line="736" />
<source>Select Project Folder</source>
<translation>Selecteer Projectmap</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="793" />
<location filename="../novelwriter/tools/welcome.py" line="792" />
<source>Fresh Project</source>
<translation>Nieuw project</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="795" />
<location filename="../novelwriter/tools/welcome.py" line="794" />
<source>Example Project</source>
<translation>Voorbeeld project</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="797" />
<location filename="../novelwriter/tools/welcome.py" line="796" />
<source>Template: {0}</source>
<translation>Sjabloon: {0}</translation>
</message>
@@ -4243,7 +4242,7 @@
<context>
<name>_NewProjectPage</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="537" />
<location filename="../novelwriter/tools/welcome.py" line="538" />
<source>A project name is required.</source>
<translation>Een projectnaam is vereist.</translation>
</message>
@@ -4251,27 +4250,27 @@
<context>
<name>_OpenProjectPage</name>
<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>
<translation>Project pad is niet bereikbaar.</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="335" />
<location filename="../novelwriter/tools/welcome.py" line="336" />
<source>Path</source>
<translation>Pad</translation>
</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>
<translation>'{0}' uit de lijst met recente projecten verwijderen? De project bestanden zullen niet worden verwijderd.</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="369" />
<location filename="../novelwriter/tools/welcome.py" line="370" />
<source>Open Project</source>
<translation>Project openen</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="371" />
<location filename="../novelwriter/tools/welcome.py" line="372" />
<source>Remove Project</source>
<translation>Project verwijderen</translation>
</message>
@@ -4362,12 +4361,12 @@
<context>
<name>_ProjectListModel</name>
<message>
<location filename="../novelwriter/tools/welcome.py" line="454" />
<location filename="../novelwriter/tools/welcome.py" line="455" />
<source>Word Count</source>
<translation>Woord Telling</translation>
</message>
<message>
<location filename="../novelwriter/tools/welcome.py" line="455" />
<location filename="../novelwriter/tools/welcome.py" line="456" />
<source>Last Opened</source>
<translation>Laatst geopend</translation>
</message>
+4 -1
View File
@@ -322,8 +322,11 @@ class nwHeadFmt:
CHAR_POV, CHAR_FOCUS
]
# ODT Document Header Page Counter
# ODT Document Page Header
ODT_PROJECT = "{Project}"
ODT_AUTHOR = "{Author}"
ODT_PAGE = "{Page}"
ODT_AUTO = "{Project} / {Author} / {Page}"
# END Class nwHeadFmt
+2 -2
View File
@@ -91,7 +91,7 @@ SETTINGS_TEMPLATE = {
"format.leftMargin": (float, 2.0),
"format.rightMargin": (float, 2.0),
"odt.addColours": (bool, True),
"odt.pageHeaderText": (str, nwHeadFmt.ODT_PAGE),
"odt.pageHeader": (str, nwHeadFmt.ODT_AUTO),
"odt.pageCountOffset": (int, 0),
"odt.firstLineIndent": (bool, False),
"md.preserveBreaks": (bool, True),
@@ -142,7 +142,7 @@ SETTINGS_LABELS = {
"odt": QT_TRANSLATE_NOOP("Builds", "Open Document (.odt)"),
"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.firstLineIndent": QT_TRANSLATE_NOOP("Builds", "First Line Indent"),
+1 -1
View File
@@ -330,7 +330,7 @@ class NWBuildDocument:
bldObj.setColourHeaders(self._build.getBool("odt.addColours"))
bldObj.setLanguage(self._project.data.language)
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"))
+6
View File
@@ -1048,6 +1048,12 @@ class ToOdt(Tokenizer):
# Standard Page Header
if self._headerFormat:
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"))
xPar = ET.SubElement(xHead, _mkTag("text", "p"), attrib={
_mkTag("text", "style-name"): "Header"
+5 -7
View File
@@ -1352,8 +1352,8 @@ class _OutputTab(NScrollableForm):
self.btnPageHeader.setIcon(SHARED.theme.getIcon("revert"))
self.btnPageHeader.clicked.connect(self._resetPageHeader)
self.addRow(
self._build.getLabel("odt.pageHeaderText"), self.odtPageHeader,
button=self.btnPageHeader, stretch=(2, 3)
self._build.getLabel("odt.pageHeader"), self.odtPageHeader,
button=self.btnPageHeader, stretch=(1, 1)
)
self.odtPageCountOffset = NSpinBox(self)
@@ -1389,7 +1389,7 @@ class _OutputTab(NScrollableForm):
def loadContent(self) -> None:
"""Populate the widgets."""
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.odtFirstLineIndent.setChecked(self._build.getBool("odt.firstLineIndent"))
self.htmlAddStyles.setChecked(self._build.getBool("html.addStyles"))
@@ -1400,7 +1400,7 @@ class _OutputTab(NScrollableForm):
def saveContent(self) -> None:
"""Save choices back into build object."""
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.firstLineIndent", self.odtFirstLineIndent.isChecked())
self._build.setValue("html.addStyles", self.htmlAddStyles.isChecked())
@@ -1414,9 +1414,7 @@ class _OutputTab(NScrollableForm):
def _resetPageHeader(self) -> None:
"""Reset the ODT header format to default."""
self.odtPageHeader.setText(" / ".join(filter(bool, [
SHARED.project.data.name, SHARED.project.data.author, nwHeadFmt.ODT_PAGE
])))
self.odtPageHeader.setText(nwHeadFmt.ODT_AUTO)
self.odtPageHeader.setCursorPosition(0)
return
@@ -79,7 +79,7 @@
<office:master-styles>
<style:master-page style:name="Standard" style:page-layout-name="PM1">
<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-first>
<text:p text:style-name="Header" />
@@ -103,7 +103,7 @@
<office:master-styles>
<style:master-page style:name="Standard" style:page-layout-name="PM1">
<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-first>
<text:p text:style-name="Header" />
+3 -3
View File
@@ -711,8 +711,8 @@ def testCoreToOdt_SaveFlat(mockGUI, fncPath, tstPaths):
assert odt._dLanguage == "nb"
odt.setColourHeaders(True)
assert odt._colourHead is True
odt.setHeaderFormat(nwHeadFmt.ODT_PAGE, 1)
assert odt._headerFormat == nwHeadFmt.ODT_PAGE
odt.setHeaderFormat(nwHeadFmt.ODT_AUTO, 1)
assert odt._headerFormat == nwHeadFmt.ODT_AUTO
odt.setPageLayout(148, 210, 20, 18, 17, 15)
assert odt._mDocWidth == "14.800cm"
@@ -759,7 +759,7 @@ def testCoreToOdt_SaveFull(mockGUI, fncPath, tstPaths):
odt._isNovel = True
# 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 = (
"## Chapter One\n\n"
+3 -4
View File
@@ -673,7 +673,7 @@ def testBuildSettings_Output(qtbot: QtBot, nwGUI: GuiMain):
# Check initial values
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.odtFirstLineIndent.isChecked() is False
assert outTab.htmlAddStyles.isChecked() is False
@@ -695,7 +695,7 @@ def testBuildSettings_Output(qtbot: QtBot, nwGUI: GuiMain):
outTab.saveContent()
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.getBool("odt.firstLineIndent") 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
# Reset header format
SHARED.project.data.setName("Test Project")
outTab.btnPageHeader.click()
assert outTab.odtPageHeader.text() == f"Test Project / {nwHeadFmt.ODT_PAGE}"
assert outTab.odtPageHeader.text() == nwHeadFmt.ODT_AUTO
# Finish
bSettings._dialogButtonClicked(bSettings.buttonBox.button(QDialogButtonBox.Close))