"
@@ -144,27 +144,27 @@ class GuiAbout(QDialog):
"
{title2}
"
"
{credits}
"
).format(
- title1 = self.tr("About novelWriter"),
- copyright = nw.__copyright__,
- website = self.tr("Website: {0}").format(webLink),
- title2 = self.tr("Credits"),
- credits = " ".join(["%s%s" % (listPrefix, x) for x in nw.__credits__]),
- intro = self.tr(
+ title1 = self.tr("About novelWriter"),
+ copy = nw.__copyright__,
+ link = self.tr("Website: {0}").format(webLink),
+ title2 = self.tr("Credits"),
+ credits = " ".join(["%s%s" % (listPrefix, x) for x in nw.__credits__]),
+ intro = self.tr(
"novelWriter is a markdown-like text editor designed for organising and "
"writing novels. It is written in Python 3 with a Qt5 GUI, using PyQt5."
),
- license1 = self.tr(
+ license1 = self.tr(
"novelWriter is free software: you can redistribute it and/or modify it "
"under the terms of the GNU General Public License as published by the "
"Free Software Foundation, either version 3 of the License, or (at your "
"option) any later version."
),
- license2 = self.tr(
+ license2 = self.tr(
"novelWriter is distributed in the hope that it will be useful, but "
"WITHOUT ANY WARRANTY; without even the implied warranty of "
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
),
- license3 = self.tr(
+ license3 = self.tr(
"See the Licence tab for the full licence text, or visit the "
"GNU website at {0} for more details."
).format(
@@ -172,34 +172,47 @@ class GuiAbout(QDialog):
),
)
+ trOrder = self.tr("{0}{1}: {2}")
+ i18n = [
+ ("American English", "Veronica Berglyd Olsen"),
+ ("British English", "Veronica Berglyd Olsen"),
+ ("Français", "Jan Lüdke (jyhelle)"),
+ ("Norsk Bokmål", "Veronica Berglyd Olsen"),
+ ("Português", "Bruno Meneguello"),
+ ]
+ aboutMsg += "
%s
%s
" % (
+ self.tr("Translations"),
+ " ".join([trOrder.format(listPrefix, n, c) for n, c in i18n]),
+ )
+
theTheme = self.theParent.theTheme
theIcons = self.theParent.theTheme.theIcons
- if theTheme.themeName:
+ if theTheme.themeName and theTheme.themeAuthor != "N/A":
aboutMsg += "
" % (
+ self.tr("Syntax: {0}").format(theTheme.syntaxName),
+ self._wrapTable([
+ (self.tr("Author"), theTheme.syntaxAuthor),
+ (self.tr("Credit"), theTheme.syntaxCredit),
+ (self.tr("Licence"), licURL),
+ ])
)
self.pageAbout.setHtml(aboutMsg)
@@ -245,6 +247,16 @@ class GuiAbout(QDialog):
self.pageLicense.setHtml("Error loading licence text ...")
return
+ def _wrapTable(self, theData):
+ """Wrap a list of label/value tuples in a html table.
+ """
+ theTable = []
+ for aLabel, aValue in theData:
+ theTable.append(
+ f"
{aLabel}:
{aValue}
"
+ )
+ return "
%s
" % "".join(theTable)
+
def _setStyleSheet(self):
"""Set stylesheet for all browser tabs
"""
@@ -255,6 +267,9 @@ class GuiAbout(QDialog):
"a {{"
" color: rgb({hColR},{hColG},{hColB});"
"}}\n"
+ "td {{"
+ " padding-right: 0.8em;"
+ "}}\n"
).format(
hColR = self.theParent.theTheme.colHead[0],
hColG = self.theParent.theTheme.colHead[1],
From b410ef5d08aad2f87685eb4e5aaaebd30b5154af Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Wed, 3 Mar 2021 22:51:13 +0100
Subject: [PATCH 3/4] Update translations
---
i18n/nw_en_US.ts | 110 ++++++++++++++-----------
i18n/nw_fr.ts | 208 ++++++++++++++++++++++++++++-------------------
i18n/nw_nb_NO.ts | 114 ++++++++++++++------------
i18n/nw_pt.ts | 196 ++++++++++++++++++++++++++------------------
4 files changed, 368 insertions(+), 260 deletions(-)
diff --git a/i18n/nw_en_US.ts b/i18n/nw_en_US.ts
index d9188d2f..0c61be13 100644
--- a/i18n/nw_en_US.ts
+++ b/i18n/nw_en_US.ts
@@ -1,6 +1,5 @@
-
-
+Common
@@ -335,7 +334,7 @@
GuiAbout
-
+ About novelWriter
@@ -350,69 +349,84 @@
-
+ Website: {0}
-
+ Credits
-
+ novelWriter is a markdown-like text editor designed for organising and writing novels. It is written in Python 3 with a Qt5 GUI, using PyQt5.
-
+ novelWriter is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
+ Theme: {0}
-
- Author: {0}
-
-
-
-
- Credit: {0}
-
-
-
-
+ Icons: {0}
-
+ Syntax: {0}
-
+ LicenceLicense
-
+ novelWriter is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
-
+ See the Licence tab for the full licence text, or visit the GNU website at {0} for more details.See the License tab for the full license text, or visit the GNU website at {0} for more details.
-
- Licence: {0}
- License: {0}
+
+ Translations
+
+
+
+
+ Author
+
+
+
+
+ Credit
+
+
+
+
+ Concept
+
+
+
+
+ i18n
+
+
+
+
+ Developer
+
@@ -3596,37 +3610,37 @@
GuiProjectEditReplace
-
+ Keyword
-
+ Replace With
-
+ Save entry
-
+ Add new entry
-
+ Delete selected entry
-
+ Text Replace List for Preview and Export
-
+ Select item to edit
@@ -3634,77 +3648,77 @@
GuiProjectEditStatus
-
+ Save
-
+ ColourColor
-
+ Novel File Status Levels
-
+ Note File Importance Levels
-
+ Select ColourSelect Color
-
+ New Item
-
+ Label
-
+ Usage
-
+ Add new entry
-
+ Delete selected entry
-
+ Select item to edit
-
+ Cannot delete a status item that is in use.
-
+ Not in use
-
+ Used once
-
+ Used by {0} items
diff --git a/i18n/nw_fr.ts b/i18n/nw_fr.ts
index ed010368..f70dd561 100644
--- a/i18n/nw_fr.ts
+++ b/i18n/nw_fr.ts
@@ -3,72 +3,72 @@
Common
-
+ in the futuredans le futur
-
+ just nowmaintenant
-
+ a minute agoil y a une minute
-
+ {0} minutes agoil y a {0} minutes
-
+ an hour agoil y a une heure
-
+ {0} hours agoil y a {0} heures
-
+ a day agohier
-
+ {0} days agoil y a {0} jours
-
+ a week agoil y a une semaine
-
+ {0} weeks agoil y a {0} semaines
-
+ a month agoil y a un mois
-
+ {0} months agoil y a {0} mois
-
+ a year agoil y a un an
-
+ {0} years agoil y a {0} ans
@@ -334,7 +334,7 @@
GuiAbout
-
+ About novelWriterÀ propos de novelWriter
@@ -349,70 +349,85 @@
Version
-
+ LicenceLicence
-
+ Website: {0}Site Web: {0}
-
+ CreditsCrédits
-
+ novelWriter is a markdown-like text editor designed for organising and writing novels. It is written in Python 3 with a Qt5 GUI, using PyQt5.novelWriter est un éditeur markdown pour organiser et écrire des romans. Il est écrit en Python 3 avec un interface utilisateur Qt5, basé sur PyQt5.
-
+ novelWriter is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.novelWriter est un logiciel libre: vous pouvez le redistribuer et/ou le modifier selon les termes de la licence publique générale GNU telle que publiée par la Free Software Foundation, dans la version 3 de cette licence ou (à votre choix) dans une version plus récente.
-
+ novelWriter is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.novelWriter est diffusé dans l'espoir qu'il sera utile, mais SANS GARANTIE D'AUCUNE SORTE, en particulier cconcernant sa QUALITÉ MARCHANDE ou son APTITUDE À UN USAGE SPÉCIFIQUE.
-
+ See the Licence tab for the full licence text, or visit the GNU website at {0} for more details.Ouvrez l'onglet Licence pour voir le texte complet de la licence (en anglais), ou visitez le site de GNU à l'adresse {0} pour en lire une traduction ou pour obtenir plus de détails.
-
+ Theme: {0}Thème: {0}
-
- Author: {0}
- Auteur: {0}
-
-
-
- Credit: {0}
- Crédits: {0}
-
-
-
- Licence: {0}
- Licence: {0}
-
-
-
+ Icons: {0}Icônes: {0}
-
+ Syntax: {0}Syntaxe: {0}
+
+
+ Translations
+
+
+
+
+ Author
+ Auteur
+
+
+
+ Credit
+ Crédits
+
+
+
+ Concept
+
+
+
+
+ i18n
+
+
+
+
+ Developer
+
+ GuiBuildNovel
@@ -3537,57 +3552,57 @@
GuiProjectEditMain
-
+ Project SettingsParamètres du projet
-
+ Working titleTitre de travail
-
+ Should be set only once.Evitez de le changer ensuite.
-
+ Novel titleTitre du roman
-
+ Change whenever you want!Modifiez le à volonté !
-
+ Author(s)Auteur(s)
-
+ One name per line.Un nom par ligne.
-
+ DefaultDéfauts
-
+ Spell check languageLangue du texte
-
+ Overrides main preferences.Prioritaire sur les réglages de nW.
-
+ No backup on closeNe pas sauvegarder en fermant
@@ -3595,92 +3610,117 @@
GuiProjectEditReplace
-
+ KeywordMot-clé
-
+ Replace WithRemplacer par
-
+ Save entryEnregistrer cette entrée
-
+ Add new entryAjouter une nouvelle entrée
-
+ Delete selected entrySupprimer l'entrée sélectionnée
-
+ Text Replace List for Preview and ExportRemplacements dans le texte pour les aperçus et exportations
+
+
+ Select item to edit
+
+ GuiProjectEditStatus
-
- New
- Nouveau
-
-
-
- Delete
- Effacer
-
-
-
+ SaveEnregistrer
-
+ ColourCouleur
-
- Name
- Nom
-
-
-
+ Novel File Status LevelsÉtats des fichiers du roman
-
+ Note File Importance LevelsImportance des fichiers de notes
-
+ Select ColourChoisir la couleur
-
+ New ItemNouvel item
-
- Cannot delete status item that is in use.
- On ne peut pas retirer un élément d'état tant qu'il est utilisé.
+
+ Label
+ Label
-
- {0} [{1}]
- {0} [{1}]
+
+ Usage
+
+
+
+
+ Add new entry
+ Ajouter une nouvelle entrée
+
+
+
+ Delete selected entry
+ Supprimer l'entrée sélectionnée
+
+
+
+ Select item to edit
+
+
+
+
+ Cannot delete a status item that is in use.
+
+
+
+
+ Not in use
+
+
+
+
+ Used once
+
+
+
+
+ Used by {0} items
+
diff --git a/i18n/nw_nb_NO.ts b/i18n/nw_nb_NO.ts
index 679c46b0..ce791594 100644
--- a/i18n/nw_nb_NO.ts
+++ b/i18n/nw_nb_NO.ts
@@ -1,6 +1,5 @@
-
-
+Common
@@ -335,7 +334,7 @@
GuiAbout
-
+ About novelWriterOm novelWriter
@@ -350,70 +349,85 @@
Utgivelse
-
+ LicenceLisens
-
+ Website: {0}Nettside: {0}
-
+ CreditsKrediteringer
-
+ novelWriter is a markdown-like text editor designed for organising and writing novels. It is written in Python 3 with a Qt5 GUI, using PyQt5.novelWriter er en markdown-liknende teksteditor laget for å kunne organisere og skrive romaner og noveller. Programmet er skrevet i Python 3 med et brukergrensesnitt i Qt 5 via PyQt5.
-
+ novelWriter is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.novelWriter er gratis programvare: du kan videredistribuere det og/eller modifisere det under vilkårene i GNU General Public License som utgitt av Free Software Foundation, enten versjon 3 av Lisensen, eller (etter eget valg) enhver senere versjon.
-
+ novelWriter is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.novelWriter er distribuert i håp om at det vil være nyttig, men UTEN NOEN GARANTI; uten selv en underforstått garanti vedrørende SALGBARHET eller EGNETHET TIL ET BESTEMT FORMÅL. Se GNU General Public Licence for flere detaljer.
-
+ See the Licence tab for the full licence text, or visit the GNU website at {0} for more details.Se lisens-fanen for fulltekst-versjonen av lisensen (på engelsk), eller besøk GNU sin nettside på {0} for mer informasjon.
-
+ Theme: {0}Tema: {0}
-
- Author: {0}
- Ansvarlig: {0}
-
-
-
- Credit: {0}
- Kreditert: {0}
-
-
-
- Licence: {0}
- Lisens: {0}
-
-
-
+ Icons: {0}Ikoner: {0}
-
+ Syntax: {0}Syntaks: {0}
+
+
+ Translations
+ Oversettelser
+
+
+
+ Author
+ Ansvarlig
+
+
+
+ Credit
+ Kreditert
+
+
+
+ Concept
+ Konsept
+
+
+
+ i18n
+
+
+
+
+ Developer
+ Utvikler
+ GuiBuildNovel
@@ -3596,37 +3610,37 @@
GuiProjectEditReplace
-
+ KeywordKodeord
-
+ Replace WithErstatt med
-
+ Save entryLagre tekst
-
+ Add new entryLegg til ny
-
+ Delete selected entrySlett valgte element
-
+ Text Replace List for Preview and ExportErstatningsliste for forhåndsvisning og eksport
-
+ Select item to editVelg enhet å redigere
@@ -3634,77 +3648,77 @@
GuiProjectEditStatus
-
+ SaveLagre
-
+ ColourFarge
-
+ Novel File Status LevelsStatusnivåer i roman-filer
-
+ Note File Importance LevelsViktighetsnivåer i notatfiler
-
+ Select ColourVelg farge
-
+ New ItemLegg til
-
+ LabelNavn
-
+ UsageBruk
-
+ Add new entryLegg til ny
-
+ Delete selected entrySlett valgte element
-
+ Select item to editVelg enhet å redigere
-
+ Cannot delete a status item that is in use.Kan ikke slette status som er i bruk.
-
+ Not in useIkke i bruk
-
+ Used onceBrukt ett sted
-
+ Used by {0} itemsBrukt {0} steder
diff --git a/i18n/nw_pt.ts b/i18n/nw_pt.ts
index b74ccc95..95028794 100644
--- a/i18n/nw_pt.ts
+++ b/i18n/nw_pt.ts
@@ -3,72 +3,72 @@
Common
-
+ in the futureno futuro
-
+ just nowagora
-
+ a minute agoum minuto atrás
-
+ {0} minutes ago{0} minutos atrás
-
+ an hour agouma hora atrás
-
+ {0} hours ago{0} horas atrás
-
+ a day agoum dia atrás
-
+ {0} days ago{0} dias atrás
-
+ a week agouma semana atrás
-
+ {0} weeks ago{0} semanas atrás
-
+ a month agoum mês atrás
-
+ {0} months ago{0} meses atrás
-
+ a year agoum ano atrás
-
+ {0} years ago{0} anos atrás
@@ -334,47 +334,47 @@
GuiAbout
-
+ About novelWriterSobre o novelWriter
-
+ novelWriter is a markdown-like text editor designed for organising and writing novels. It is written in Python 3 with a Qt5 GUI, using PyQt5.novelWriter é um editor de texto som sintaxe semelhante ao markdown, projetado para a escrita e organização de livros. É escrito em Python 3 com interface de usuário em Qr5, usando PyQt5.
-
+ novelWriter is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.novelWriter é distribuído na especativa de que seja útil, mas SEM NENHUMA GARANTIA, nem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM PROPÓSITO ESPECÍFICO.
-
+ CreditsCréditos
-
+ novelWriter is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.novelWriter é um software livre: você pode redistribuí-lo e/ou modificá-lo sob os termos da GNU Licença Pública Geral, assim como publicada pela Free Software Foundation, tanto na versão 3 da licença, ou (à sua escolha) qualquer versão subsequente.
-
+ Theme: {0}Tema: {0}
-
+ Icons: {0}Ícones: {0}
-
+ Syntax: {0}Sintaxe: {0}
-
+ Website: {0}Website: {0}
@@ -389,29 +389,44 @@
Lançamento
-
+ See the Licence tab for the full licence text, or visit the GNU website at {0} for more details.Veja a aba de Licença para o texto completo de licença, ou visite o website da GNU em {0} para mais detalhes.
-
+ LicenceLicença
-
- Author: {0}
- Autor: {0}
+
+ Translations
+
-
- Credit: {0}
- Créditos: {0}
+
+ Author
+ Autor
-
- Licence: {0}
- Licença: {0}
+
+ Credit
+ Créditos
+
+
+
+ Concept
+
+
+
+
+ i18n
+
+
+
+
+ Developer
+
@@ -3537,57 +3552,57 @@
GuiProjectEditMain
-
+ Should be set only once.Deve ser definido apenas uma vez.
-
+ Change whenever you want!Mude quando quiser!
-
+ One name per line.Um nome por linha.
-
+ DefaultPadrão
-
+ Overrides main preferences.Sobrescreve as preferências globais.
-
+ Project SettingsConfigurações do Projeto
-
+ Working titleNome do projeto
-
+ Novel titleTítulo do tivro
-
+ Author(s)Autor(es)
-
+ Spell check languageIdioma do corretor ortográfico
-
+ No backup on closeNão salvar cópia de segurança ao fechar
@@ -3595,92 +3610,117 @@
GuiProjectEditReplace
-
+ KeywordPalavra-chave
-
+ Replace WithSubstituir Com
-
+ Save entrySalvar entrada
-
+ Add new entryAdiciona uma nova entrada
-
+ Delete selected entryRemove a entrada selecionada
-
+ Text Replace List for Preview and ExportLista de Substituição de Texto para o Preview ou Exportação
+
+
+ Select item to edit
+
+ GuiProjectEditStatus
-
- Name
- Nome
-
-
-
+ Novel File Status LevelsNíves de Estado do Arquivo do Livro
-
+ Note File Importance LevelsNíves de Importância do Arquivo do Livro
-
+ New ItemNovo Item
-
- New
- Novo
-
-
-
- Delete
- Remover
-
-
-
+ SaveSalvar
-
+ ColourCor
-
+ Select ColourSelecione a Cor
-
- Cannot delete status item that is in use.
- Não é possível remover um item de status que estja em uso.
+
+ Label
+ Rótulo
-
- {0} [{1}]
-
+
+ Usage
+
+
+
+
+ Add new entry
+ Adiciona uma nova entrada
+
+
+
+ Delete selected entry
+ Remove a entrada selecionada
+
+
+
+ Select item to edit
+
+
+
+
+ Cannot delete a status item that is in use.
+
+
+
+
+ Not in use
+
+
+
+
+ Used once
+
+
+
+
+ Used by {0} items
+
From a8bf247d0109bc3a4d53b7b02730e4b93ea971de Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Wed, 3 Mar 2021 22:56:03 +0100
Subject: [PATCH 4/4] Consistency
---
i18n/nw_pt.ts | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/i18n/nw_pt.ts b/i18n/nw_pt.ts
index 2d3b8f39..0d9d964e 100644
--- a/i18n/nw_pt.ts
+++ b/i18n/nw_pt.ts
@@ -1,6 +1,5 @@
-
-
+Common
@@ -3643,7 +3642,7 @@
Select item to edit
- Selecione o item para editar
+ Selecione um item para editar