Merge pull request #730 from vkbo/cleanup

Source Cleanup
This commit is contained in:
Veronica Berglyd Olsen
2021-03-28 17:25:30 +02:00
committed by GitHub
52 changed files with 202 additions and 240 deletions
+29 -29
View File
@@ -798,22 +798,22 @@
<context>
<name>GuiDocEditFooter</name>
<message>
<location filename="../nw/gui/doceditor.py" line="2468"/>
<location filename="../nw/gui/doceditor.py" line="2466"/>
<source>Status</source>
<translation></translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2609"/>
<location filename="../nw/gui/doceditor.py" line="2607"/>
<source>Line: {0} ({1})</source>
<translation></translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2625"/>
<location filename="../nw/gui/doceditor.py" line="2623"/>
<source>Words: {0} ({1})</source>
<translation></translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2630"/>
<location filename="../nw/gui/doceditor.py" line="2628"/>
<source>Document size is {0} bytes</source>
<translation></translation>
</message>
@@ -821,22 +821,22 @@
<context>
<name>GuiDocEditHeader</name>
<message>
<location filename="../nw/gui/doceditor.py" line="2259"/>
<location filename="../nw/gui/doceditor.py" line="2258"/>
<source>Edit document meta</source>
<translation></translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2270"/>
<location filename="../nw/gui/doceditor.py" line="2269"/>
<source>Search document</source>
<translation></translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2281"/>
<location filename="../nw/gui/doceditor.py" line="2280"/>
<source>Toggle Focus Mode</source>
<translation></translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2292"/>
<location filename="../nw/gui/doceditor.py" line="2291"/>
<source>Close the document</source>
<translation></translation>
</message>
@@ -1379,7 +1379,7 @@
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1143"/>
<location filename="../nw/guimain.py" line="1147"/>
<source>Changes are saved automatically.</source>
<translation></translation>
</message>
@@ -1419,102 +1419,102 @@
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="697"/>
<location filename="../nw/guimain.py" line="701"/>
<source>Text files ({0})</source>
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="698"/>
<location filename="../nw/guimain.py" line="702"/>
<source>Markdown files ({0})</source>
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="699"/>
<location filename="../nw/guimain.py" line="703"/>
<source>novelWriter files ({0})</source>
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="700"/>
<location filename="../nw/guimain.py" line="704"/>
<source>All files ({0})</source>
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="702"/>
<location filename="../nw/guimain.py" line="706"/>
<source>Import File</source>
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="717"/>
<location filename="../nw/guimain.py" line="721"/>
<source>Could not read file. The file must be an existing text file.</source>
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="723"/>
<location filename="../nw/guimain.py" line="727"/>
<source>Please open a document to import the text file into.</source>
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="730"/>
<location filename="../nw/guimain.py" line="734"/>
<source>Import Document</source>
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="730"/>
<location filename="../nw/guimain.py" line="734"/>
<source>Importing the file will overwrite the current content of the document. Do you want to proceed?</source>
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="879"/>
<location filename="../nw/guimain.py" line="883"/>
<source>Indexing: &apos;{0}&apos;</source>
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="879"/>
<location filename="../nw/guimain.py" line="883"/>
<source>Unknown item</source>
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="897"/>
<location filename="../nw/guimain.py" line="901"/>
<source>Indexing completed in {0} ms</source>
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="904"/>
<location filename="../nw/guimain.py" line="908"/>
<source>The project index has been successfully rebuilt.</source>
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1107"/>
<location filename="../nw/guimain.py" line="1111"/>
<source>Information</source>
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1109"/>
<location filename="../nw/guimain.py" line="1113"/>
<source>Warning</source>
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1111"/>
<location filename="../nw/guimain.py" line="1115"/>
<source>Error</source>
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1113"/>
<location filename="../nw/guimain.py" line="1117"/>
<source>This is a bug!</source>
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1114"/>
<location filename="../nw/guimain.py" line="1118"/>
<source>Internal Error</source>
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1143"/>
<location filename="../nw/guimain.py" line="1147"/>
<source>Exit</source>
<translation></translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1143"/>
<location filename="../nw/guimain.py" line="1147"/>
<source>Do you want to exit novelWriter?</source>
<translation></translation>
</message>
+29 -29
View File
@@ -798,22 +798,22 @@
<context>
<name>GuiDocEditFooter</name>
<message>
<location filename="../nw/gui/doceditor.py" line="2468"/>
<location filename="../nw/gui/doceditor.py" line="2466"/>
<source>Status</source>
<translation>État</translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2609"/>
<location filename="../nw/gui/doceditor.py" line="2607"/>
<source>Line: {0} ({1})</source>
<translation>Ligne: {0} ({1})</translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2625"/>
<location filename="../nw/gui/doceditor.py" line="2623"/>
<source>Words: {0} ({1})</source>
<translation>Mots: {0} ({1})</translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2630"/>
<location filename="../nw/gui/doceditor.py" line="2628"/>
<source>Document size is {0} bytes</source>
<translation>La taille du document est de {0} octets</translation>
</message>
@@ -821,22 +821,22 @@
<context>
<name>GuiDocEditHeader</name>
<message>
<location filename="../nw/gui/doceditor.py" line="2259"/>
<location filename="../nw/gui/doceditor.py" line="2258"/>
<source>Edit document meta</source>
<translation>Modifier les métadonnées du document</translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2270"/>
<location filename="../nw/gui/doceditor.py" line="2269"/>
<source>Search document</source>
<translation>Chercher dans le document</translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2281"/>
<location filename="../nw/gui/doceditor.py" line="2280"/>
<source>Toggle Focus Mode</source>
<translation>Basculer le mode focus</translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2292"/>
<location filename="../nw/gui/doceditor.py" line="2291"/>
<source>Close the document</source>
<translation>Fermer le document</translation>
</message>
@@ -1379,7 +1379,7 @@
<translation>Fermer le projet en cours ?</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1143"/>
<location filename="../nw/guimain.py" line="1147"/>
<source>Changes are saved automatically.</source>
<translation>Les changements sont enregistrés automatiquement.</translation>
</message>
@@ -1419,102 +1419,102 @@
<translation>L&apos;index du projet est périmé ou endommagé. Reconstruction de l&apos;index en cours.</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="697"/>
<location filename="../nw/guimain.py" line="701"/>
<source>Text files ({0})</source>
<translation>Fichiers de texte ({0})</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="698"/>
<location filename="../nw/guimain.py" line="702"/>
<source>Markdown files ({0})</source>
<translation>Fichiers Markdown ({0})</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="699"/>
<location filename="../nw/guimain.py" line="703"/>
<source>novelWriter files ({0})</source>
<translation>fichiers novelWriter ({0})</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="700"/>
<location filename="../nw/guimain.py" line="704"/>
<source>All files ({0})</source>
<translation>Tous les filchiers ({0})</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="702"/>
<location filename="../nw/guimain.py" line="706"/>
<source>Import File</source>
<translation>Importer un fichier</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="717"/>
<location filename="../nw/guimain.py" line="721"/>
<source>Could not read file. The file must be an existing text file.</source>
<translation>Lecture du fichier impossible. Il faut un fichier texte existant.</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="723"/>
<location filename="../nw/guimain.py" line="727"/>
<source>Please open a document to import the text file into.</source>
<translation>Veuillez ouvrir un document dans lequel sera importé le texte.</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="730"/>
<location filename="../nw/guimain.py" line="734"/>
<source>Import Document</source>
<translation>Importer un document</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="730"/>
<location filename="../nw/guimain.py" line="734"/>
<source>Importing the file will overwrite the current content of the document. Do you want to proceed?</source>
<translation>Le contenu du fichier importé va remplacer le contenu actuel du document. Faut-il continuer ?</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="879"/>
<location filename="../nw/guimain.py" line="883"/>
<source>Indexing: &apos;{0}&apos;</source>
<translation>Indexation d e: &apos;{0}&apos;</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="879"/>
<location filename="../nw/guimain.py" line="883"/>
<source>Unknown item</source>
<translation>Item inconnu</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="897"/>
<location filename="../nw/guimain.py" line="901"/>
<source>Indexing completed in {0} ms</source>
<translation>Indexation effectuée en {0} ms</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="904"/>
<location filename="../nw/guimain.py" line="908"/>
<source>The project index has been successfully rebuilt.</source>
<translation>L&apos;index du projet a é correctement reconstruit.</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1107"/>
<location filename="../nw/guimain.py" line="1111"/>
<source>Information</source>
<translation>Information</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1109"/>
<location filename="../nw/guimain.py" line="1113"/>
<source>Warning</source>
<translation>Avertissement</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1111"/>
<location filename="../nw/guimain.py" line="1115"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1113"/>
<location filename="../nw/guimain.py" line="1117"/>
<source>This is a bug!</source>
<translation>Ceci est un bug !</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1114"/>
<location filename="../nw/guimain.py" line="1118"/>
<source>Internal Error</source>
<translation>Erreur interne</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1143"/>
<location filename="../nw/guimain.py" line="1147"/>
<source>Exit</source>
<translation>Sortir</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1143"/>
<location filename="../nw/guimain.py" line="1147"/>
<source>Do you want to exit novelWriter?</source>
<translation>Voulez-vous sortir de novelWriter ?</translation>
</message>
+34 -33
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS><TS version="2.0" language="nb_NO" sourcelanguage="en_GB">
<!DOCTYPE TS>
<TS version="2.1" language="nb_NO" sourcelanguage="en_GB">
<context>
<name>Common</name>
<message>
@@ -798,22 +799,22 @@
<context>
<name>GuiDocEditFooter</name>
<message>
<location filename="../nw/gui/doceditor.py" line="2468"/>
<location filename="../nw/gui/doceditor.py" line="2466"/>
<source>Status</source>
<translation>Status</translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2609"/>
<location filename="../nw/gui/doceditor.py" line="2607"/>
<source>Line: {0} ({1})</source>
<translation>Linje: {0} ({1})</translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2625"/>
<location filename="../nw/gui/doceditor.py" line="2623"/>
<source>Words: {0} ({1})</source>
<translation>Ord: {0} ({1})</translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2630"/>
<location filename="../nw/gui/doceditor.py" line="2628"/>
<source>Document size is {0} bytes</source>
<translation>Dokumentet er {0} byte</translation>
</message>
@@ -821,22 +822,22 @@
<context>
<name>GuiDocEditHeader</name>
<message>
<location filename="../nw/gui/doceditor.py" line="2259"/>
<location filename="../nw/gui/doceditor.py" line="2258"/>
<source>Edit document meta</source>
<translation>Rediger dokumentinstillinger</translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2270"/>
<location filename="../nw/gui/doceditor.py" line="2269"/>
<source>Search document</source>
<translation>Søk i dokumentet</translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2281"/>
<location filename="../nw/gui/doceditor.py" line="2280"/>
<source>Toggle Focus Mode</source>
<translation>Slå av/ &quot;Fokus-modus&quot;</translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2292"/>
<location filename="../nw/gui/doceditor.py" line="2291"/>
<source>Close the document</source>
<translation>Lukk dokumentet</translation>
</message>
@@ -1321,7 +1322,7 @@
<message>
<location filename="../nw/guimain.py" line="127"/>
<source>Novel</source>
<translation>Innhold</translation>
<translation>Roman</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="143"/>
@@ -1346,7 +1347,7 @@
<message>
<location filename="../nw/guimain.py" line="189"/>
<source>Outline</source>
<translation>Disposisjon</translation>
<translation>Oversikt</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="342"/>
@@ -1374,7 +1375,7 @@
<translation>Ønsker du å lukke dette prosjektet?</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1143"/>
<location filename="../nw/guimain.py" line="1147"/>
<source>Changes are saved automatically.</source>
<translation>Endringer lagres automatisk.</translation>
</message>
@@ -1414,102 +1415,102 @@
<translation>Prosjektets indeks er utdatert eller skadet. Bygger indeksen nytt.</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="697"/>
<location filename="../nw/guimain.py" line="701"/>
<source>Text files ({0})</source>
<translation>Tekstfiler ({0})</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="698"/>
<location filename="../nw/guimain.py" line="702"/>
<source>Markdown files ({0})</source>
<translation>Markdown-filer ({0})</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="699"/>
<location filename="../nw/guimain.py" line="703"/>
<source>novelWriter files ({0})</source>
<translation>novelWriter-filer ({0})</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="700"/>
<location filename="../nw/guimain.py" line="704"/>
<source>All files ({0})</source>
<translation>Alle filer ({0})</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="702"/>
<location filename="../nw/guimain.py" line="706"/>
<source>Import File</source>
<translation>Importer fil</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="717"/>
<location filename="../nw/guimain.py" line="721"/>
<source>Could not read file. The file must be an existing text file.</source>
<translation>Kunne ikke lese filen. Filen eksistere fra før av.</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="723"/>
<location filename="../nw/guimain.py" line="727"/>
<source>Please open a document to import the text file into.</source>
<translation>Vennligst åpne et dokument hvor teksten i filen kan importeres.</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="730"/>
<location filename="../nw/guimain.py" line="734"/>
<source>Import Document</source>
<translation>Importer dokument</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="730"/>
<location filename="../nw/guimain.py" line="734"/>
<source>Importing the file will overwrite the current content of the document. Do you want to proceed?</source>
<translation>Å importere filen vil overskrive all eksisterende tekst i dokumentet. Ønsker du å fortsette?</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="879"/>
<location filename="../nw/guimain.py" line="883"/>
<source>Indexing: &apos;{0}&apos;</source>
<translation>Indekserer: &apos;{0}&apos;</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="879"/>
<location filename="../nw/guimain.py" line="883"/>
<source>Unknown item</source>
<translation>Ukjent enhet</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="897"/>
<location filename="../nw/guimain.py" line="901"/>
<source>Indexing completed in {0} ms</source>
<translation>Indekseringen tok {0} ms</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="904"/>
<location filename="../nw/guimain.py" line="908"/>
<source>The project index has been successfully rebuilt.</source>
<translation>Prosjektets indeks har blitt bygget nytt.</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1107"/>
<location filename="../nw/guimain.py" line="1111"/>
<source>Information</source>
<translation>Informasjon</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1109"/>
<location filename="../nw/guimain.py" line="1113"/>
<source>Warning</source>
<translation>Advarsel</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1111"/>
<location filename="../nw/guimain.py" line="1115"/>
<source>Error</source>
<translation>Feil</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1113"/>
<location filename="../nw/guimain.py" line="1117"/>
<source>This is a bug!</source>
<translation>Dette er en systemfeil!</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1114"/>
<location filename="../nw/guimain.py" line="1118"/>
<source>Internal Error</source>
<translation>Intern feil</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1143"/>
<location filename="../nw/guimain.py" line="1147"/>
<source>Exit</source>
<translation>Avslutt</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1143"/>
<location filename="../nw/guimain.py" line="1147"/>
<source>Do you want to exit novelWriter?</source>
<translation>Ønsker du å avslutte novelWriter?</translation>
</message>
@@ -1934,7 +1935,7 @@
<message>
<location filename="../nw/gui/mainmenu.py" line="492"/>
<source>Focus Outline</source>
<translation> til disposisjon</translation>
<translation> til oversikt</translation>
</message>
<message>
<location filename="../nw/gui/mainmenu.py" line="493"/>
+29 -29
View File
@@ -798,22 +798,22 @@
<context>
<name>GuiDocEditFooter</name>
<message>
<location filename="../nw/gui/doceditor.py" line="2609"/>
<location filename="../nw/gui/doceditor.py" line="2607"/>
<source>Line: {0} ({1})</source>
<translation>Linha: {0} ({1})</translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2625"/>
<location filename="../nw/gui/doceditor.py" line="2623"/>
<source>Words: {0} ({1})</source>
<translation>Palavras: {0} ({1})</translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2468"/>
<location filename="../nw/gui/doceditor.py" line="2466"/>
<source>Status</source>
<translation>Estado</translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2630"/>
<location filename="../nw/gui/doceditor.py" line="2628"/>
<source>Document size is {0} bytes</source>
<translation>O tamanho do documento é {0} bytes</translation>
</message>
@@ -821,22 +821,22 @@
<context>
<name>GuiDocEditHeader</name>
<message>
<location filename="../nw/gui/doceditor.py" line="2259"/>
<location filename="../nw/gui/doceditor.py" line="2258"/>
<source>Edit document meta</source>
<translation>Editar os meta-dados do documento</translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2270"/>
<location filename="../nw/gui/doceditor.py" line="2269"/>
<source>Search document</source>
<translation>Procurar no documento</translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2281"/>
<location filename="../nw/gui/doceditor.py" line="2280"/>
<source>Toggle Focus Mode</source>
<translation>Alternar o &quot;Modo Foco&quot;</translation>
</message>
<message>
<location filename="../nw/gui/doceditor.py" line="2292"/>
<location filename="../nw/gui/doceditor.py" line="2291"/>
<source>Close the document</source>
<translation>Fechar o documento</translation>
</message>
@@ -1329,32 +1329,32 @@
<translation>Nota: Se o programa ou o computador sofreu uma falha anteriormente, o bloqueio pode ser sobrescrito com segurança. Se, no entanto, outra instância do novelWriter esteja com o projeto aberto, sobrescrever o bloqueio pode corromper o projeto e não é recomendado.</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="879"/>
<location filename="../nw/guimain.py" line="883"/>
<source>Unknown item</source>
<translation>Item desconhecido</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1107"/>
<location filename="../nw/guimain.py" line="1111"/>
<source>Information</source>
<translation>Informação</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1109"/>
<location filename="../nw/guimain.py" line="1113"/>
<source>Warning</source>
<translation>Alerta</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1111"/>
<location filename="../nw/guimain.py" line="1115"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1113"/>
<location filename="../nw/guimain.py" line="1117"/>
<source>This is a bug!</source>
<translation>Isto é um bug!</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1114"/>
<location filename="../nw/guimain.py" line="1118"/>
<source>Internal Error</source>
<translation>Erro Interno</translation>
</message>
@@ -1389,7 +1389,7 @@
<translation>Fechar o projeto atual?</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1143"/>
<location filename="../nw/guimain.py" line="1147"/>
<source>Changes are saved automatically.</source>
<translation>As alterações serão salvas automaticamente.</translation>
</message>
@@ -1409,47 +1409,47 @@
<translation>Projeto Bloqueado</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="702"/>
<location filename="../nw/guimain.py" line="706"/>
<source>Import File</source>
<translation>Importar Arquivo</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="717"/>
<location filename="../nw/guimain.py" line="721"/>
<source>Could not read file. The file must be an existing text file.</source>
<translation>Não foi possível ler o arquivo. O arquivo deve ser um arquivo de texto existente.</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="723"/>
<location filename="../nw/guimain.py" line="727"/>
<source>Please open a document to import the text file into.</source>
<translation>Por favor, abra um documento para importar o text nele.</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="730"/>
<location filename="../nw/guimain.py" line="734"/>
<source>Import Document</source>
<translation>Importar Documento</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="730"/>
<location filename="../nw/guimain.py" line="734"/>
<source>Importing the file will overwrite the current content of the document. Do you want to proceed?</source>
<translation>Importar o arquivo vai sobrescrever o conteúdo atual do documento. Você deseja continuar?</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="904"/>
<location filename="../nw/guimain.py" line="908"/>
<source>The project index has been successfully rebuilt.</source>
<translation>O índice do projeto foi reconstruído com sucesso.</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1143"/>
<location filename="../nw/guimain.py" line="1147"/>
<source>Exit</source>
<translation>Sair</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="1143"/>
<location filename="../nw/guimain.py" line="1147"/>
<source>Do you want to exit novelWriter?</source>
<translation>Você deseja realmente sair do novelWriter?</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="897"/>
<location filename="../nw/guimain.py" line="901"/>
<source>Indexing completed in {0} ms</source>
<translation>Indexação completa em {0} ms</translation>
</message>
@@ -1489,27 +1489,27 @@
<translation>O projeto foi bloqueado pelo computador &apos;{0}&apos; ({1} {2}), ativo pela última vez em {3}.</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="879"/>
<location filename="../nw/guimain.py" line="883"/>
<source>Indexing: &apos;{0}&apos;</source>
<translation>Indexando: &apos;{0}&apos;</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="697"/>
<location filename="../nw/guimain.py" line="701"/>
<source>Text files ({0})</source>
<translation>Arquivos de texto ({0})</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="698"/>
<location filename="../nw/guimain.py" line="702"/>
<source>Markdown files ({0})</source>
<translation>Arquivos Markdown ({0})</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="699"/>
<location filename="../nw/guimain.py" line="703"/>
<source>novelWriter files ({0})</source>
<translation>Arquivos do novelWriter ({0})</translation>
</message>
<message>
<location filename="../nw/guimain.py" line="700"/>
<location filename="../nw/guimain.py" line="704"/>
<source>All files ({0})</source>
<translation>Todos os arquivos ({0})</translation>
</message>
+2 -3
View File
@@ -31,9 +31,8 @@ from datetime import datetime
from PyQt5.QtWidgets import qApp
from PyQt5.QtCore import QCoreApplication
from nw.constants import (
nwConst, nwUnicode, nwItemClass, nwItemType, nwItemLayout
)
from nw.enum import nwItemClass, nwItemType, nwItemLayout
from nw.constants import nwConst, nwUnicode
logger = logging.getLogger(__name__)
+2 -2
View File
@@ -39,9 +39,9 @@ from PyQt5.QtCore import (
QTranslator
)
from nw.constants import nwConst, nwFiles, nwUnicode
from nw.common import splitVersionNumber, formatTimeStamp
from nw.error import logException
from nw.common import splitVersionNumber, formatTimeStamp
from nw.constants import nwConst, nwFiles, nwUnicode
logger = logging.getLogger(__name__)
@@ -26,9 +26,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
from PyQt5.QtCore import QCoreApplication, QT_TRANSLATE_NOOP
from nw.constants.enum import (
nwItemClass, nwItemLayout, nwItemType, nwOutline
)
from nw.enum import nwItemClass, nwItemLayout, nwItemType, nwOutline
def trConst(tString):
"""Wrapper function for locally translating constants.
-30
View File
@@ -1,30 +0,0 @@
# -*- coding: utf-8 -*-
from nw.constants.constants import (
trConst, nwConst, nwLists, nwRegEx, nwFiles, nwKeyWords, nwLabels,
nwQuotes, nwUnicode, nwHtmlUnicode
)
from nw.constants.enum import (
nwAlert, nwDocAction, nwItemClass, nwItemLayout, nwItemType, nwOutline,
nwDocInsert, nwWidget
)
__all__ = [
"trConst",
"nwConst",
"nwLists",
"nwRegEx",
"nwFiles",
"nwKeyWords",
"nwLabels",
"nwQuotes",
"nwUnicode",
"nwHtmlUnicode",
"nwAlert",
"nwDocAction",
"nwItemClass",
"nwItemLayout",
"nwItemType",
"nwOutline",
"nwDocInsert",
"nwWidget",
]
+1 -2
View File
@@ -31,9 +31,8 @@ from functools import partial
from PyQt5.QtCore import QCoreApplication
from nw.constants import nwAlert
from nw.enum import nwAlert, nwItemLayout, nwItemClass
from nw.common import isHandle
from nw.constants import nwItemLayout, nwItemClass
logger = logging.getLogger(__name__)
+3 -5
View File
@@ -32,12 +32,10 @@ import os
from time import time
from nw.constants import (
nwFiles, nwKeyWords, nwItemType, nwItemClass, nwItemLayout, nwAlert,
nwUnicode
)
from nw.core.document import NWDoc
from nw.enum import nwItemType, nwItemClass, nwItemLayout, nwAlert
from nw.common import isHandle, isTitleTag, isItemClass, isItemLayout
from nw.constants import nwFiles, nwKeyWords, nwUnicode
from nw.core.document import NWDoc
logger = logging.getLogger(__name__)
+2 -4
View File
@@ -28,10 +28,8 @@ import logging
from lxml import etree
from nw.constants import nwItemType, nwItemClass, nwItemLayout
from nw.common import (
checkInt, isHandle, isItemClass, isItemLayout, isItemType
)
from nw.enum import nwItemType, nwItemClass, nwItemLayout
from nw.common import checkInt, isHandle, isItemClass, isItemLayout, isItemType
logger = logging.getLogger(__name__)
+2 -3
View File
@@ -45,9 +45,8 @@ from nw.common import (
checkString, checkBool, checkInt, isHandle, formatTimeStamp,
makeFileNameSafe, hexToInt
)
from nw.constants import (
trConst, nwFiles, nwItemType, nwItemClass, nwItemLayout, nwLabels, nwAlert
)
from nw.enum import nwItemType, nwItemClass, nwItemLayout, nwAlert
from nw.constants import trConst, nwFiles, nwLabels
logger = logging.getLogger(__name__)
+1 -1
View File
@@ -27,7 +27,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
import logging
from nw.core.tokenizer import Tokenizer
from nw.constants import nwLabels, nwKeyWords, nwHtmlUnicode
from nw.constants import nwKeyWords, nwLabels, nwHtmlUnicode
logger = logging.getLogger(__name__)
+3 -2
View File
@@ -32,9 +32,10 @@ from functools import partial
from PyQt5.QtCore import QCoreApplication, QRegularExpression
from nw.core.document import NWDoc
from nw.enum import nwItemLayout, nwItemType
from nw.common import numberToRoman
from nw.constants import nwConst, nwUnicode, nwItemLayout, nwItemType, nwRegEx
from nw.constants import nwConst, nwRegEx, nwUnicode
from nw.core.document import NWDoc
logger = logging.getLogger(__name__)
+1 -1
View File
@@ -26,8 +26,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
import logging
from nw.core.tokenizer import Tokenizer
from nw.constants import nwLabels
from nw.core.tokenizer import Tokenizer
logger = logging.getLogger(__name__)
+2 -2
View File
@@ -29,11 +29,11 @@ import logging
from lxml import etree
from hashlib import sha256
from datetime import datetime
from zipfile import ZipFile
from datetime import datetime
from nw.constants import nwKeyWords, nwLabels
from nw.core.tokenizer import Tokenizer
from nw.constants import nwLabels, nwKeyWords
logger = logging.getLogger(__name__)
+4 -5
View File
@@ -29,14 +29,13 @@ import logging
import os
from lxml import etree
from hashlib import sha256
from time import time
from hashlib import sha256
from nw.core.item import NWItem
from nw.enum import nwItemType, nwItemClass, nwItemLayout
from nw.common import checkHandle
from nw.constants import (
nwFiles, nwItemType, nwItemClass, nwItemLayout, nwConst, nwLists
)
from nw.constants import nwConst, nwLists, nwFiles
from nw.core.item import NWItem
logger = logging.getLogger(__name__)
View File
+4 -5
View File
@@ -44,12 +44,11 @@ from PyQt5.QtWidgets import (
QSizePolicy, QDoubleSpinBox, QComboBox
)
from nw.common import fuzzyTime, makeFileNameSafe
from nw.gui.custom import QSwitch
from nw.core import ToHtml, ToOdt, ToMarkdown
from nw.constants import (
nwConst, nwAlert, nwFiles, nwItemType, nwItemLayout, nwItemClass
)
from nw.enum import nwAlert, nwItemType, nwItemLayout, nwItemClass
from nw.common import fuzzyTime, makeFileNameSafe
from nw.constants import nwConst, nwFiles
from nw.gui.custom import QSwitch
logger = logging.getLogger(__name__)
+1 -1
View File
@@ -40,7 +40,7 @@ from PyQt5.QtWidgets import (
QLineEdit
)
from nw.constants import trConst, nwUnicode, nwQuotes
from nw.constants import trConst, nwQuotes, nwUnicode
logger = logging.getLogger(__name__)
+3 -5
View File
@@ -50,12 +50,10 @@ from PyQt5.QtWidgets import (
)
from nw.core import NWDoc, NWSpellSimple, countWords
from nw.gui.dochighlight import GuiDocHighlighter
from nw.enum import nwAlert, nwDocAction, nwDocInsert, nwItemClass
from nw.common import transferCase
from nw.constants import (
trConst, nwConst, nwAlert, nwUnicode, nwDocAction, nwDocInsert,
nwItemClass, nwKeyWords, nwLabels
)
from nw.constants import nwConst, trConst, nwKeyWords, nwLabels, nwUnicode
from nw.gui.dochighlight import GuiDocHighlighter
logger = logging.getLogger(__name__)
+1 -1
View File
@@ -34,7 +34,7 @@ from PyQt5.QtGui import (
QColor, QTextCharFormat, QFont, QSyntaxHighlighter, QBrush
)
from nw.constants import nwUnicode, nwRegEx
from nw.constants import nwRegEx, nwUnicode
logger = logging.getLogger(__name__)
+2 -2
View File
@@ -33,9 +33,9 @@ from PyQt5.QtWidgets import (
QListWidgetItem, QDialogButtonBox
)
from nw.constants import nwAlert, nwItemType
from nw.gui.custom import QHelpLabel
from nw.core import NWDoc
from nw.enum import nwAlert, nwItemType
from nw.gui.custom import QHelpLabel
logger = logging.getLogger(__name__)
+2 -3
View File
@@ -34,10 +34,9 @@ from PyQt5.QtWidgets import (
)
from nw.core import NWDoc
from nw.enum import nwAlert, nwItemType, nwItemClass, nwItemLayout
from nw.constants import nwConst
from nw.gui.custom import QHelpLabel
from nw.constants import (
nwAlert, nwItemType, nwItemClass, nwItemLayout, nwConst
)
logger = logging.getLogger(__name__)
+2 -1
View File
@@ -41,7 +41,8 @@ from PyQt5.QtWidgets import (
)
from nw.core import ToHtml
from nw.constants import nwAlert, nwItemType, nwDocAction, nwUnicode
from nw.enum import nwAlert, nwItemType, nwDocAction
from nw.constants import nwUnicode
logger = logging.getLogger(__name__)
+2 -3
View File
@@ -31,9 +31,8 @@ from PyQt5.QtCore import Qt
from PyQt5.QtGui import QFont, QPixmap
from PyQt5.QtWidgets import QWidget, QGridLayout, QLabel
from nw.constants import (
trConst, nwLabels, nwItemClass, nwItemType, nwItemLayout
)
from nw.enum import nwItemClass, nwItemType, nwItemLayout
from nw.constants import trConst, nwLabels
logger = logging.getLogger(__name__)
+2 -1
View File
@@ -33,8 +33,9 @@ from PyQt5.QtWidgets import (
QDialogButtonBox
)
from nw.enum import nwItemLayout, nwItemType
from nw.constants import trConst, nwLists, nwLabels
from nw.gui.custom import QSwitch
from nw.constants import trConst, nwLabels, nwItemLayout, nwItemType, nwLists
logger = logging.getLogger(__name__)
+2 -4
View File
@@ -31,10 +31,8 @@ from PyQt5.QtCore import QUrl, QProcess
from PyQt5.QtGui import QDesktopServices
from PyQt5.QtWidgets import QMenuBar, QAction
from nw.constants import (
trConst, nwItemType, nwItemClass, nwDocAction, nwDocInsert, nwKeyWords,
nwLabels, nwUnicode, nwWidget
)
from nw.enum import nwItemType, nwItemClass, nwDocAction, nwDocInsert, nwWidget
from nw.constants import trConst, nwKeyWords, nwLabels, nwUnicode
logger = logging.getLogger(__name__)
+1 -1
View File
@@ -32,8 +32,8 @@ from time import time
from PyQt5.QtCore import Qt, QSize
from PyQt5.QtWidgets import QTreeWidget, QTreeWidgetItem, QAbstractItemView
from nw.constants import nwKeyWords
from nw.common import checkInt
from nw.constants import nwKeyWords
logger = logging.getLogger(__name__)
+2 -1
View File
@@ -34,7 +34,8 @@ from PyQt5.QtWidgets import (
QTreeWidget, QTreeWidgetItem, QMenu, QAction, QAbstractItemView
)
from nw.constants import trConst, nwKeyWords, nwLabels, nwOutline
from nw.enum import nwOutline
from nw.constants import trConst, nwKeyWords, nwLabels
logger = logging.getLogger(__name__)
+1 -1
View File
@@ -32,8 +32,8 @@ from PyQt5.QtWidgets import (
QScrollArea, QWidget, QGridLayout, QHBoxLayout, QGroupBox, QLabel
)
from nw.constants import trConst, nwLabels, nwKeyWords
from nw.common import checkInt
from nw.constants import trConst, nwKeyWords, nwLabels
logger = logging.getLogger(__name__)
+3 -2
View File
@@ -35,9 +35,10 @@ from PyQt5.QtWidgets import (
QLineEdit, QFileDialog, QFontDialog, QDoubleSpinBox
)
from nw.gui.custom import QSwitch, QConfigLayout, PagedDialog, QuotesDialog
from nw.core import NWSpellSimple, NWSpellEnchant
from nw.constants import nwConst, nwAlert
from nw.enum import nwAlert
from nw.constants import nwConst
from nw.gui.custom import QSwitch, QConfigLayout, PagedDialog, QuotesDialog
logger = logging.getLogger(__name__)
+2 -2
View File
@@ -35,9 +35,9 @@ from PyQt5.QtWidgets import (
QLabel, QSpinBox, QGridLayout, QHBoxLayout, QLineEdit, QAbstractItemView
)
from nw.gui.custom import PagedDialog, QSwitch
from nw.constants import nwUnicode
from nw.common import numberToRoman
from nw.constants import nwUnicode
from nw.gui.custom import PagedDialog, QSwitch
logger = logging.getLogger(__name__)
+1 -1
View File
@@ -35,7 +35,7 @@ from PyQt5.QtWidgets import (
QComboBox
)
from nw.constants import nwAlert
from nw.enum import nwAlert
from nw.gui.custom import QSwitch, PagedDialog, QConfigLayout
logger = logging.getLogger(__name__)
+2 -4
View File
@@ -37,10 +37,8 @@ from PyQt5.QtWidgets import (
)
from nw.core import NWDoc
from nw.constants import (
trConst, nwLabels, nwItemType, nwItemClass, nwItemLayout, nwAlert,
nwConst, nwLists
)
from nw.enum import nwItemType, nwItemClass, nwItemLayout, nwAlert
from nw.constants import nwConst, trConst, nwLists, nwLabels
logger = logging.getLogger(__name__)
+2 -1
View File
@@ -35,8 +35,9 @@ from PyQt5.QtWidgets import (
QGroupBox, QGridLayout, QSpinBox
)
from nw.enum import nwItemClass
from nw.common import makeFileNameSafe
from nw.constants import trConst, nwLabels, nwItemClass
from nw.constants import trConst, nwLabels
from nw.gui.custom import QSwitch
logger = logging.getLogger(__name__)
+1 -1
View File
@@ -39,7 +39,7 @@ from PyQt5.QtGui import (
QPalette, QColor, QIcon, QFont, QFontMetrics, QFontDatabase, QPixmap
)
from nw.constants import nwAlert
from nw.enum import nwAlert
logger = logging.getLogger(__name__)
+2 -1
View File
@@ -34,7 +34,8 @@ from PyQt5.QtWidgets import (
QAbstractItemView, QPushButton, QLineEdit, QLabel
)
from nw.constants import nwFiles, nwAlert
from nw.enum import nwAlert
from nw.constants import nwFiles
logger = logging.getLogger(__name__)
+2 -1
View File
@@ -38,8 +38,9 @@ from PyQt5.QtWidgets import (
QLabel, QGroupBox, QMenu, QAction, QFileDialog, QSpinBox, QHBoxLayout
)
from nw.enum import nwAlert
from nw.common import formatTime, checkInt
from nw.constants import nwConst, nwFiles, nwAlert
from nw.constants import nwConst, nwFiles
from nw.gui.custom import QSwitch
logger = logging.getLogger(__name__)
+2 -1
View File
@@ -46,8 +46,9 @@ from nw.gui import (
GuiProjectTree, GuiProjectWizard, GuiTheme, GuiWordList, GuiWritingStats
)
from nw.core import NWProject, NWDoc, NWIndex
from nw.constants import nwItemType, nwItemClass, nwAlert, nwLists, nwWidget
from nw.enum import nwItemType, nwItemClass, nwAlert, nwWidget
from nw.common import getGuiItem, hexToInt
from nw.constants import nwLists
logger = logging.getLogger(__name__)
+1 -1
View File
@@ -27,7 +27,7 @@ from dummy import causeOSError
from nw.core import NWProject, NWDoc
from nw.core.item import NWItem
from nw.constants import nwItemClass, nwItemLayout
from nw.enum import nwItemClass, nwItemLayout
@pytest.mark.core
def testCoreDocument_LoadSave(monkeypatch, dummyGUI, nwMinimal):
+1 -1
View File
@@ -31,7 +31,7 @@ from tools import cmpFiles
from nw.core.project import NWProject
from nw.core.index import NWIndex, countWords
from nw.constants import nwItemClass, nwItemLayout
from nw.enum import nwItemClass, nwItemLayout
@pytest.mark.core
def testCoreIndex_LoadSave(monkeypatch, nwLipsum, dummyGUI, outDir, refDir):
+1 -1
View File
@@ -26,7 +26,7 @@ from lxml import etree
from nw.core import NWProject
from nw.core.item import NWItem
from nw.constants import nwItemClass, nwItemType, nwItemLayout
from nw.enum import nwItemClass, nwItemType, nwItemLayout
@pytest.mark.core
def testCoreItem_Setters(dummyGUI):
+2 -1
View File
@@ -31,8 +31,9 @@ from tools import cmpFiles, writeFile, readFile
from dummy import causeOSError
from nw.core.project import NWProject
from nw.constants import nwItemClass, nwItemType, nwItemLayout, nwFiles
from nw.enum import nwItemClass, nwItemType, nwItemLayout
from nw.common import formatTimeStamp
from nw.constants import nwFiles
@pytest.mark.core
def testCoreProject_NewMinimal(fncDir, outDir, refDir, tmpDir, dummyGUI):
+2 -1
View File
@@ -26,7 +26,8 @@ import pytest
from lxml import etree
from nw.core.project import NWProject, NWItem, NWTree
from nw.constants import nwItemClass, nwItemType, nwItemLayout, nwFiles
from nw.enum import nwItemClass, nwItemType, nwItemLayout
from nw.constants import nwFiles
@pytest.fixture(scope="function")
def dummyItems(dummyGUI):
+1 -1
View File
@@ -33,7 +33,7 @@ from PyQt5.QtWidgets import QAction, QMessageBox, QDialog
from nw.gui.itemeditor import GuiItemEditor
from nw.gui.doceditor import GuiDocEditor
from nw.gui.projtree import GuiProjectTree
from nw.constants import nwItemType, nwDocAction, nwWidget
from nw.enum import nwItemType, nwDocAction, nwWidget
keyDelay = 2
typeDelay = 1
+1 -1
View File
@@ -26,7 +26,7 @@ from PyQt5.QtCore import Qt, QUrl
from PyQt5.QtGui import QTextCursor
from PyQt5.QtWidgets import qApp, QAction, QMessageBox
from nw.constants import nwDocAction
from nw.enum import nwDocAction
keyDelay = 2
typeDelay = 1
+1 -1
View File
@@ -29,7 +29,7 @@ from tools import cmpFiles, getGuiItem
from PyQt5.QtWidgets import QAction, QMessageBox
from nw.gui import GuiItemEditor, GuiProjectTree
from nw.constants import nwItemLayout
from nw.enum import nwItemLayout
keyDelay = 2
typeDelay = 1
+2 -3
View File
@@ -28,9 +28,8 @@ from PyQt5.QtGui import QTextCursor, QTextBlock
from PyQt5.QtWidgets import QAction, QFileDialog, QMessageBox
from nw.gui.doceditor import GuiDocEditor
from nw.constants import (
nwUnicode, nwDocAction, nwDocInsert, nwKeyWords, nwWidget
)
from nw.enum import nwDocAction, nwDocInsert, nwWidget
from nw.constants import nwKeyWords, nwUnicode
keyDelay = 2
typeDelay = 1
+1 -1
View File
@@ -25,7 +25,7 @@ import pytest
from PyQt5.QtCore import Qt, QPoint
from PyQt5.QtWidgets import QAction, QTreeWidgetItem, QMessageBox
from nw.constants import nwOutline
from nw.enum import nwOutline
keyDelay = 2
typeDelay = 1
+1 -1
View File
@@ -30,7 +30,7 @@ from PyQt5.QtWidgets import QAction, QMessageBox
from nw.guimain import GuiMain
from nw.gui.projtree import GuiProjectTree
from nw.constants import nwItemType, nwItemClass
from nw.enum import nwItemType, nwItemClass
@pytest.mark.gui
def testGuiProjTree_TreeItems(qtbot, caplog, monkeypatch, nwGUI, nwMinimal):
+1 -1
View File
@@ -30,7 +30,7 @@ from PyQt5.QtCore import Qt
from PyQt5.QtWidgets import QFileDialog, QWizard, QMessageBox
from nw.gui import GuiProjectWizard
from nw.constants import nwItemClass
from nw.enum import nwItemClass
from nw.gui.projwizard import (
ProjWizardIntroPage, ProjWizardFolderPage, ProjWizardPopulatePage,
ProjWizardCustomPage, ProjWizardFinalPage