From 509b613ad88a4abda854da70d1f3d6141649e2b1 Mon Sep 17 00:00:00 2001 From: hneemann Date: Sun, 8 Nov 2020 11:21:13 +0100 Subject: [PATCH] fixed a minor issue in the language files --- .../expression/ExpressionDialog.java | 2 +- .../de/neemann/gui/language/Resources.java | 2 +- src/main/resources/lang/lang_de.xml | 46 +++---- src/main/resources/lang/lang_en.xml | 42 +++---- src/main/resources/lang/lang_es.xml | 72 +++++------ src/main/resources/lang/lang_es_ref.xml | 117 +++++++++--------- src/main/resources/lang/lang_fr.xml | 46 ++++--- src/main/resources/lang/lang_fr_ref.xml | 41 +++--- src/main/resources/lang/lang_pt.xml | 83 ++++++------- src/main/resources/lang/lang_pt_ref.xml | 78 ++++++------ src/main/resources/lang/lang_zh.xml | 26 +--- src/main/resources/lang/lang_zh_ref.xml | 76 +++++------- 12 files changed, 298 insertions(+), 333 deletions(-) diff --git a/src/main/java/de/neemann/digital/gui/components/expression/ExpressionDialog.java b/src/main/java/de/neemann/digital/gui/components/expression/ExpressionDialog.java index 478fd8781..9b529fd3e 100644 --- a/src/main/java/de/neemann/digital/gui/components/expression/ExpressionDialog.java +++ b/src/main/java/de/neemann/digital/gui/components/expression/ExpressionDialog.java @@ -57,7 +57,7 @@ public class ExpressionDialog extends JDialog { new ShowStringDialog( ExpressionDialog.this, Lang.get("msg_expressionHelpTitle"), - Lang.get("msg_expressionHelp")) + Lang.get("msg_expressionHelp"), true) .setVisible(true); } }.createJButton()); diff --git a/src/main/java/de/neemann/gui/language/Resources.java b/src/main/java/de/neemann/gui/language/Resources.java index a3a9e0b51..8b985f037 100644 --- a/src/main/java/de/neemann/gui/language/Resources.java +++ b/src/main/java/de/neemann/gui/language/Resources.java @@ -152,7 +152,7 @@ public class Resources { while (reader.hasMoreChildren()) { reader.moveDown(); String key = reader.getAttribute("name"); - String value = reader.getValue(); + String value = reader.getValue().trim(); map.put(key, value); reader.moveUp(); } diff --git a/src/main/resources/lang/lang_de.xml b/src/main/resources/lang/lang_de.xml index 4a928b30d..04d44813f 100644 --- a/src/main/resources/lang/lang_de.xml +++ b/src/main/resources/lang/lang_de.xml @@ -1856,19 +1856,17 @@ Sind evtl. die Namen der Variablen nicht eindeutig? Fehler beim Öffnen einer PDF-Datei! - <h1>Digital</h1>Ein einfacher Simulator für digitale Schaltkreise. - Geschrieben von H. Neemann 2016-2020 - - Die Icons stammen aus dem <a href="http://tango.freedesktop.org">Tango Desktop Project</a>. - - Besuche das Projekt auf <a href="https://github.com/hneemann/[[name]]">GitHub</a>. + Digital +

Ein einfacher Simulator für digitale Schaltkreise.

+

Geschrieben von H. Neemann 2016-2020

+

Die Icons stammen aus dem Tango Desktop Project.

+

Besuche das Projekt auf GitHub. Die jeweils neueste Version steht dort ebenfalls zum - <a href="https://github.com/hneemann/[[name]]/releases/latest">Download</a> bereit. - - Per GitHub kann auch ein <a href="https://github.com/hneemann/[[name]]/issues/new?body=version:%20[[version]]&labels=bug">Fehler</a> + Download bereit.

+

Per GitHub kann auch ein Fehler gemeldet oder - eine <a href="https://github.com/hneemann/[[name]]/issues/new?labels=enhancement">Verbesserung</a> - vorgeschlagen werden. + eine Verbesserung + vorgeschlagen werden.

]]> {0} aktive Elemente Fehler bei der Analyse der Schaltung. @@ -2067,18 +2065,20 @@ Stellen Sie sicher, dass der Flash-Vorgang abgeschlossen ist, bevor Sie diesen D ]]> Ausdrücke - Zur Definition eines Ausdruckes können alle üblichen -Notationen verwendet werden: - -Und: "&", "&&", "*", "∧" -Oder: "|", "||", "+", "∨", "#" -Exkl. Oder: "^", "⊻" -Nicht: "!", "~", "¬" - -UND hat Vorrang vor ODER bzw. Exkl. ODER. -Mehrere Ausdrücke können durch "," oder ";" getrennt werden. -Sollen die Ausdrücke benannt werden, kann die let-Anweisung verwendet -werden: "let U=A+B, let V=A*B" + +

Zur Definition eines Ausdruckes können alle üblichen + Notationen verwendet werden:

+

+ Und: "&", "&&", "*", "∧"
+ Oder: "|", "||", "+", "∨", "#"
+ Exkl. Oder: "^", "⊻"
+ Nicht: "!", "~", "¬"
+

+

UND hat Vorrang vor ODER bzw. Exkl. ODER. + Mehrere Ausdrücke können durch "," oder ";" getrennt werden. + Sollen die Ausdrücke benannt werden, kann die let-Anweisung verwendet + werden: "let U=A+B, let V=A*B"

]]> + Testvektoren diff --git a/src/main/resources/lang/lang_en.xml b/src/main/resources/lang/lang_en.xml index d10de9529..46859b954 100644 --- a/src/main/resources/lang/lang_en.xml +++ b/src/main/resources/lang/lang_en.xml @@ -1870,18 +1870,16 @@ Error while creating the concrete circuit! - <h1>Digital</h1>A simple simulator for digital circuits. - Written by H. Neemann in 2016-2020. - - The icons are taken from the <a href="http://tango.freedesktop.org">Tango Desktop Project</a>. - - Visit the project at <a href="https://github.com/hneemann/[[name]]">GitHub</a>. - At Github you can also <a href="https://github.com/hneemann/[[name]]/releases/latest">download</a> - the latest release. - - There you also can file an <a href="https://github.com/hneemann/[[name]]/issues/new?body=version:%20[[version]]&labels=bug">issue</a> + Digital +

A simple simulator for digital circuits.

+

Written by H. Neemann in 2016-2020.

+

The icons are taken from the Tango Desktop Project.

+

Visit the project at GitHub. + At Github you can also download + the latest release.

+

There you also can file an issue or suggest - an <a href="https://github.com/hneemann/[[name]]/issues/new?labels=enhancement">enhancement</a>. + an enhancement.

]]> {0} nodes Error analysing the circuit @@ -2072,18 +2070,18 @@ ]]> Expressions - To define an expression you can use all most common notations: - - And: "&", "&&", "*", "∧" - Or: "|", "||", "+", "∨", "#" - XOr: "^", "⊻" - Not: "!", "~", "¬" - - As usual AND precedes OR and XOr. - - Multiple expressions can be separated by "," or ";". + To define an expression you can use all most common notations:

+

+ And: "&", "&&", "*", "∧"
+ Or: "|", "||", "+", "∨", "#"
+ XOr: "^", "⊻"
+ Not: "!", "~", "¬" +

+

As usual AND precedes OR and XOr.

+

Multiple expressions can be separated by "," or ";". If you want to name the expressions you can use the - let command: "let U=A+B, let V=A*B". + let command: "let U=A+B, let V=A*B".

]]> Test vectors diff --git a/src/main/resources/lang/lang_es.xml b/src/main/resources/lang/lang_es.xml index 4a614b780..75eb9852e 100644 --- a/src/main/resources/lang/lang_es.xml +++ b/src/main/resources/lang/lang_es.xml @@ -1406,25 +1406,23 @@ Muestra un gráfico con los valores medidos en una ventana aparte. Exporta a un archivo ZIP Exporta el circuito como un archivo ZIP. - El ZIP contendrá todos los archivos que sean necesarios para el funcionamiento del circuito. + El ZIP contendrá todos los archivos que sean necesarios para el funcionamiento del circuito. + Etiquetar entradas y salidas Fija una etiqueta a todas las entradas y salidas que no la tienen. ¡Error al abrir un archivo PDF! - <h1>Digital</h1>Un sencillo simulador para circuitos digitales. - Escrito por H. Neemann entre 2016-2020. - - Los iconos se han tomado de <a href="http://tango.freedesktop.org">Tango Desktop Project</a>. - - Visita el proyecto en la dirección <a href="https://github.com/hneemann/[[name]]">GitHub</a>. - También disponible en GitHub <a href="https://github.com/hneemann/[[name]]/releases/latest">descarga</a> - la última versión. - - Allí también puedes aportar un <a - href="https://github.com/hneemann/[[name]]/issues/new?body=version:%20[[version]]&labels=bug">problema</a> + Digital +

Un sencillo simulador para circuitos digitales.

+

Escrito por H. Neemann entre 2016-2020.

+

Los iconos se han tomado de Tango Desktop Project.

+

Visita el proyecto en la dirección GitHub. + También disponible en GitHub descarga + la última versión.

+

Allí también puedes aportar un problema o sugerencia - o <a href="https://github.com/hneemann/[[name]]/issues/new?labels=enhancement">mejoras</a>. - - Traducido al castellano por Ángel Millán León + o mejoras.

+

Traducido al castellano por Ángel Millán León

]]> {0} nodos Error al analizar el circuito Color @@ -1567,32 +1565,36 @@ Para hacer esto, use el asterisco ('*') en la etiqueta de la ROM. El asterisco se reemplazará por la ruta completa construida con los nombres de los circuitos incrustados. Si un circuito contiene sólo un componente de ROM, es suficiente usar sólo el asterisco como una etiqueta para él. - Todos los circuitos incrustados deben ser nombrados para que un único nombre pueda ser formado para cada componente de ROM. - </html> + Todos los circuitos incrustados deben ser nombrados para que un único nombre pueda ser formado para cada componente + de ROM. + </html> + <html> - <h1>Nueva versión {0} disponible</h1> - <p>Hay una nueva versión del simulador disponible.</p> - <p>En la ruta <a href="https://github.com/hneemann/[[name]]/releases/latest">, notas de la versión</a> - puede econtrar los cambios y mejoras..</p> - <p>Aquí puede <a href="https://github.com/hneemann/[[name]]/releases/latest">descargar</a> la nueva versión.</p> - </html> + <h1>Nueva versión {0} disponible</h1> + <p>Hay una nueva versión del simulador disponible.</p> + <p>En la ruta <a href="https://github.com/hneemann/[[name]]/releases/latest">, notas de la versión</a> + puede econtrar los cambios y mejoras..</p> + <p>Aquí puede <a href="https://github.com/hneemann/[[name]]/releases/latest">descargar</a> la + nueva versión.</p> + </html> + Expresiones - Para definir una expresión puede usar las notaciones más conocidas: - - AND: "&", "&&", "*", "∧" - OR: "|", "||", "+", "∨", "#" - XOR: "^", "⊻" + Para definir una expresión puede usar las notaciones más conocidas:

+

+ AND: "&", "&&", "*", "∧"
+ OR: "|", "||", "+", "∨", "#"
+ XOR: "^", "⊻"
NOT: "!", "~", "¬" - - Como es habitual, AND prevalece sobre OR y XOR. - - Expresiones múltiples pueden separarse con "," or ";". +

+

Como es habitual, AND prevalece sobre OR y XOR.

+

Expresiones múltiples pueden separarse con "," or ";". Si quiere nombrar las expresiones, puede usar el - comando let: "let U=A+B, let V=A*B" + comando let: "let U=A+B, let V=A*B"

]]> Vectores de prueba <html> - <head><style>pre { background-color: #E0E0E0;}</style></head> - <body> + <head><style>pre { background-color: #E0E0E0;}</style></head> + <body> <p> La primera línea tiene que contener los nombres de las entradas y las salidas. Las siguientes líneas contienen los valores esperados. Una 'X' indica un "indiferente", y una 'Z' indica un valor de alta impedancia. diff --git a/src/main/resources/lang/lang_es_ref.xml b/src/main/resources/lang/lang_es_ref.xml index 0d933c033..8f4b3389a 100644 --- a/src/main/resources/lang/lang_es_ref.xml +++ b/src/main/resources/lang/lang_es_ref.xml @@ -1489,37 +1489,35 @@ Shows a K-map representation of the table! Documentation Open {0} - Show measurement value table - Show table with the measured values in a separate window. - Show measurement graph - Shows a graph with the measured values in a separate window. - Export to ZIP file - Exports the circuit as a ZIP file. - The ZIP file thus contains all the files that are necessary for the operation of the circuit. - Label Inputs and Outputs - Set a label to all inputs and outputs without a label. - Error opening a PDF file! - <h1>Digital</h1>A simple simulator for digital circuits. - Written by H. Neemann in 2016-2020. - - The icons are taken from the <a href="http://tango.freedesktop.org">Tango Desktop Project</a>. - - Visit the project at <a href="https://github.com/hneemann/[[name]]">GitHub</a>. - At Github you can also <a href="https://github.com/hneemann/[[name]]/releases/latest">download</a> - the latest release. - - There you also can file an <a - href="https://github.com/hneemann/[[name]]/issues/new?body=version:%20[[version]]&labels=bug">issue</a> - or suggest - an <a href="https://github.com/hneemann/[[name]]/issues/new?labels=enhancement">enhancement</a>. + Show measurement value table + Show table with the measured values in a separate window. + Show measurement graph + Shows a graph with the measured values in a separate window. + Export to ZIP file + Exports the circuit as a ZIP file. + The ZIP file thus contains all the files that are necessary for the operation of the circuit. - {0} nodes - Error analysing the circuit - Color - Error calculating a step - Error creating the circuit - Error during simplification - Error during creation of hardware configuration. + Label Inputs and Outputs + Set a label to all inputs and outputs without a label. + Error opening a PDF file! + Digital +

A simple simulator for digital circuits.

+

Written by H. Neemann in 2016-2020.

+

The icons are taken from the Tango Desktop Project.

+

Visit the project at GitHub. + At Github you can also download + the latest release.

+

There you also can file an issue + or suggest + an enhancement.

]]> + + {0} nodes + Error analysing the circuit + Color + Error calculating a step + Error creating the circuit + Error during simplification + Error during creation of hardware configuration. Error editing a attribute value Error importing the circuit {0}! Error updating the component library!! @@ -1662,38 +1660,41 @@ path constructed from the names of the embedded circuits. If a circuit contains only one ROM component, it is sufficient to use only the asterisk as a label for it. All embedded circuits must be named so that a unique name can be formed for each ROM component. - </html> - <html> + </html> + + <html> <h1>New Version {0} Available</h1> <p>There is a new release of the simulator available.</p> <p>In the <a href="https://github.com/hneemann/[[name]]/releases/latest">release notes</a> you can find the changes and improvements.</p> - <p>Here you can <a href="https://github.com/hneemann/[[name]]/releases/latest">download</a> the new release.</p> - </html> - Expressions - To define an expression you can use all most common notations: - - And: "&", "&&", "*", "∧" - Or: "|", "||", "+", "∨", "#" - XOr: "^", "⊻" - Not: "!", "~", "¬" - - As usual AND precedes OR and XOr. - - Multiple expressions can be separated by "," or ";". - If you want to name the expressions you can use the - let command: "let U=A+B, let V=A*B". - - Test vectors - <html> - <head><style>pre { background-color: #E0E0E0;}</style></head> - <body> - <p>The first line has to contain the names of inputs and outputs. - The following lines contain the expected values. - A 'X' represents a don't care, and a 'Z' represents a high Z value. - If a 'C' is used, at first all other values are set, after that a clock cycle is performed and then the - values are compared. So it's easier to test sequential logic. - A line which starts with a number sign ('#') is a comment.</p> + <p>Here you can <a href="https://github.com/hneemann/[[name]]/releases/latest">download</a> + the new release.</p> + </html> + + Expressions + To define an expression you can use all most common notations:

+

+ And: "&", "&&", "*", "∧"
+ Or: "|", "||", "+", "∨", "#"
+ XOr: "^", "⊻"
+ Not: "!", "~", "¬" +

+

As usual AND precedes OR and XOr.

+

Multiple expressions can be separated by "," or ";". + If you want to name the expressions you can use the + let command: "let U=A+B, let V=A*B".

]]> + + Test vectors + <html> + <head><style>pre { background-color: #E0E0E0;}</style></head> + <body> + <p>The first line has to contain the names of inputs and outputs. + The following lines contain the expected values. + A 'X' represents a don't care, and a 'Z' represents a high Z value. + If a 'C' is used, at first all other values are set, after that a clock cycle is performed and then the + values are compared. So it's easier to test sequential logic. + A line which starts with a number sign ('#') is a comment.</p> <p>So a test for a 2-bit counter could look like this:</p> diff --git a/src/main/resources/lang/lang_fr.xml b/src/main/resources/lang/lang_fr.xml index d82a02b67..600757e34 100644 --- a/src/main/resources/lang/lang_fr.xml +++ b/src/main/resources/lang/lang_fr.xml @@ -2028,19 +2028,17 @@ Bits Bits d'addr. Erreur lors de l'ouverture du fichier PDF! - <h1>Digital</h1>Un simulateur simple pour les circuits numériques. - Écrit par H. Neemann de 2016-2020. - - Les icônes ont été prises du <a href="http://tango.freedesktop.org">projet Tango Desktop</a>. - - Visiter le projet sur <a href="https://github.com/hneemann/[[name]]">GitHub</a>. - Sur GitHub vous pouvez aussi <a href="https://github.com/hneemann/[[name]]/releases/latest">télécharger</a> - la dernière version. - - Vous pouvez aussi y poser <a - href="https://github.com/hneemann/[[name]]/issues/new?body=version:%20[[version]]&labels=bug">une - question au sujet d'un problème</a> - ou suggérer une <a href="https://github.com/hneemann/[[name]]/issues/new?labels=enhancement">amélioration</a>. + Digital +

Un simulateur simple pour les circuits numériques.

+

Écrit par H. Neemann de 2016-2020.

+

Les icônes ont été prises du projet Tango Desktop.

+

Visiter le projet sur GitHub. + Sur GitHub vous pouvez aussi télécharger + la dernière version.

+

Vous pouvez aussi y poser une + question au sujet d'un problème + ou suggérer une amélioration.

]]> {0} noeuds Erreur lors de l'analyse du circuit @@ -2233,19 +2231,19 @@ </html> Expressions - Pour définir une expression, vous pouvez utiliser la plupart des notations - courantes: - - ET: "&", "&&", "*", "∧" - OU: "|", "||", "+", "∨", "#" - XOR: "^", "⊻" + Pour définir une expression, vous pouvez utiliser la plupart des notations + courantes:

+

+ ET: "&", "&&", "*", "∧"
+ OU: "|", "||", "+", "∨", "#"
+ XOR: "^", "⊻"
NON: "!", "~", "¬" - - Comme d'habitude, le ET à la priorité sur le OU et le XOR. - - Plusieurs expressions peuvent être séparées par "," ou ";". +

+

Comme d'habitude, le ET à la priorité sur le OU et le XOR.

+

Plusieurs expressions peuvent être séparées par "," ou ";". Si vous voulez nommer les expressions, vous pouvez utiliser la - commande let: "let U=A+B, let V=A*B". + commande let: "let U=A+B, let V=A*B".

]]> Vecteurs de test <html> diff --git a/src/main/resources/lang/lang_fr_ref.xml b/src/main/resources/lang/lang_fr_ref.xml index 0e4ce6418..4e3a6f74b 100644 --- a/src/main/resources/lang/lang_fr_ref.xml +++ b/src/main/resources/lang/lang_fr_ref.xml @@ -1884,19 +1884,16 @@ Bits Addr. Bits Error opening a PDF file! - <h1>Digital</h1>A simple simulator for digital circuits. - Written by H. Neemann in 2016-2020. - - The icons are taken from the <a href="http://tango.freedesktop.org">Tango Desktop Project</a>. - - Visit the project at <a href="https://github.com/hneemann/[[name]]">GitHub</a>. - At Github you can also <a href="https://github.com/hneemann/[[name]]/releases/latest">download</a> - the latest release. - - There you also can file an <a - href="https://github.com/hneemann/[[name]]/issues/new?body=version:%20[[version]]&labels=bug">issue</a> + Digital +

A simple simulator for digital circuits.

+

Written by H. Neemann in 2016-2020.

+

The icons are taken from the Tango Desktop Project.

+

Visit the project at GitHub. + At Github you can also download + the latest release.

+

There you also can file an issue or suggest - an <a href="https://github.com/hneemann/[[name]]/issues/new?labels=enhancement">enhancement</a>. + an enhancement.

]]> {0} nodes Error analysing the circuit @@ -2080,18 +2077,18 @@ </html> Expressions - To define an expression you can use all most common notations: - - And: "&", "&&", "*", "∧" - Or: "|", "||", "+", "∨", "#" - XOr: "^", "⊻" + To define an expression you can use all most common notations:

+

+ And: "&", "&&", "*", "∧"
+ Or: "|", "||", "+", "∨", "#"
+ XOr: "^", "⊻"
Not: "!", "~", "¬" - - As usual AND precedes OR and XOr. - - Multiple expressions can be separated by "," or ";". +

+

As usual AND precedes OR and XOr.

+

Multiple expressions can be separated by "," or ";". If you want to name the expressions you can use the - let command: "let U=A+B, let V=A*B". + let command: "let U=A+B, let V=A*B".

]]> Test vectors <html> diff --git a/src/main/resources/lang/lang_pt.xml b/src/main/resources/lang/lang_pt.xml index 6c674fdba..c1e0ce327 100644 --- a/src/main/resources/lang/lang_pt.xml +++ b/src/main/resources/lang/lang_pt.xml @@ -1464,36 +1464,35 @@ Exportar o circuito para Verilog Documentação Abrir {0} - Erro ao abrir arquivo PDF! - Mostrar o gráfico de medições - Mostrar o gráfico com os valores medidos em janela separada. - Mostrar tabela com valores medidos - Mostrar tabela com valores medidos em janela separada. - Exportar para arquivo ZIP - Exportar o circuito para um arquivo ZIP. - O arquivo ZIP conterá todos os arquivos que forem necessários para a operação do circuito. - Rotular entradas e saídas - Definir rótulo para entradas e saídas que não tiverem algum. - <h1>Digital</h1>Um simulator simples para circuitos digitais. - Elaborado por H. Neemann em 2016-2020. - - Os ícones foram tomados de <a href="http://tango.freedesktop.org">Tango Desktop Project</a>. - - Para conhecer melhor o projeto, visitar <a href="https://github.com/hneemann/[[name]]">GitHub</a>. - Última versão disponível em <a href="https://github.com/hneemann/[[name]]/releases/latest">download</a>. - - Questões poderão ser endereçadas para <a - href="https://github.com/hneemann/[[name]]/issues/new?body=version:%20[[version]]&labels=bug">issue</a> + Erro ao abrir arquivo PDF! + Mostrar o gráfico de medições + Mostrar o gráfico com os valores medidos em janela separada. + Mostrar tabela com valores medidos + Mostrar tabela com valores medidos em janela separada. + Exportar para arquivo ZIP + Exportar o circuito para um arquivo ZIP. + O arquivo ZIP conterá todos os arquivos que forem necessários para a operação do circuito. + + Rotular entradas e saídas + Definir rótulo para entradas e saídas que não tiverem algum. + Digital +

Um simulator simples para circuitos digitais.

+

Elaborado por H. Neemann em 2016-2020.

+

Os ícones foram tomados de Tango Desktop Project.

+

Para conhecer melhor o projeto, visitar GitHub. + Última versão disponível em download.

+

Questões poderão ser endereçadas para issue ou sugestões - para <a href="https://github.com/hneemann/[[name]]/issues/new?labels=enhancement">enhancement</a>. - {0} nodos - Erro ao analisar o circuito - Cor - Erro ao calcular um passo - Erro ao criar o circuito - Erro durante a simplificação - Erro durante a criação da configuração de hardware. - Erro ao editar um valor de atributo + para enhancement.

]]> + {0} nodos + Erro ao analisar o circuito + Cor + Erro ao calcular um passo + Erro ao criar o circuito + Erro durante a simplificação + Erro durante a criação da configuração de hardware. + Erro ao editar um valor de atributo Erro ao importar o circuito {0}! Erro ao atualizar a biblioteca de componentes!! Erro ao ler arquivo @@ -1630,27 +1629,27 @@ Se um circuito contiver apenas uma única ROM, isso será suficiente para se usar o asterisco como rótulo. Todos os circuitos integrados deverão term nomes únicos para cada ROM. ]]> - +

Nova versão {0} disponível

Há uma nova versão do simulador disponível.

Em Release Notes poderão ser encontradas as alterações e melhorias.

Em download se poderá encontrar a nova versão.

]]> - Expressões - Para definir uma expressão poderão ser usadas todas as notações mais comuns: - - And: "&", "&&", "*", "∧" - Or: "|", "||", "+", "∨", "#" - XOr: "^", "⊻" + Expressões + Para definir uma expressão poderão ser usadas todas as notações mais comuns:

+

+ And: "&", "&&", "*", "∧"
+ Or: "|", "||", "+", "∨", "#"
+ XOr: "^", "⊻"
Not: "!", "~", "¬" - - Como usual AND tem precedência sobre OR e XOR. - - Múltiplas expressões poderão ser separadas por "," ou ";". +

+

Como usual AND tem precedência sobre OR e XOR.

+

Múltiplas expressões poderão ser separadas por "," ou ";". Se desejado dar nome às expressões se poderá usar o comando "let" - "let U=A+B, let V=A*B" - + "let U=A+B, let V=A*B"

]]> + Arranjos de teste <html> <head><style>pre { background-color: #E0E0E0;}</style></head> diff --git a/src/main/resources/lang/lang_pt_ref.xml b/src/main/resources/lang/lang_pt_ref.xml index 8be5e8c1a..599ea72de 100644 --- a/src/main/resources/lang/lang_pt_ref.xml +++ b/src/main/resources/lang/lang_pt_ref.xml @@ -1544,37 +1544,35 @@ Exports the circuit to Verilog Documentation Open {0} - Error opening a PDF file! - Show measurement graph - Shows a graph with the measured values in a separate window. - Show measurement value table - Show table with the measured values in a separate window. - Export to ZIP file - Exports the circuit as a ZIP file. - The ZIP file thus contains all the files that are necessary for the operation of the circuit. - Label Inputs and Outputs - Set a label to all inputs and outputs without a label. - <h1>Digital</h1>A simple simulator for digital circuits. - Written by H. Neemann in 2016-2020. - - The icons are taken from the <a href="http://tango.freedesktop.org">Tango Desktop Project</a>. - - Visit the project at <a href="https://github.com/hneemann/[[name]]">GitHub</a>. - At Github you can also <a href="https://github.com/hneemann/[[name]]/releases/latest">download</a> - the latest release. - - There you also can file an <a - href="https://github.com/hneemann/[[name]]/issues/new?body=version:%20[[version]]&labels=bug">issue</a> - or suggest - an <a href="https://github.com/hneemann/[[name]]/issues/new?labels=enhancement">enhancement</a>. + Error opening a PDF file! + Show measurement graph + Shows a graph with the measured values in a separate window. + Show measurement value table + Show table with the measured values in a separate window. + Export to ZIP file + Exports the circuit as a ZIP file. + The ZIP file thus contains all the files that are necessary for the operation of the circuit. - {0} nodes - Error analysing the circuit - Color - Error calculating a step - Error creating the circuit - Error during simplification - Error during creation of hardware configuration. + Label Inputs and Outputs + Set a label to all inputs and outputs without a label. + Digital +

A simple simulator for digital circuits.

+

Written by H. Neemann in 2016-2020.

+

The icons are taken from the Tango Desktop Project.

+

Visit the project at GitHub. + At Github you can also download + the latest release.

+

There you also can file an issue + or suggest + an enhancement.

]]> + + {0} nodes + Error analysing the circuit + Color + Error calculating a step + Error creating the circuit + Error during simplification + Error during creation of hardware configuration. Error editing a attribute value Error importing the circuit {0}! Error updating the component library!! @@ -1728,18 +1726,18 @@ </html> Expressions - To define an expression you can use all most common notations: - - And: "&", "&&", "*", "∧" - Or: "|", "||", "+", "∨", "#" - XOr: "^", "⊻" + To define an expression you can use all most common notations:

+

+ And: "&", "&&", "*", "∧"
+ Or: "|", "||", "+", "∨", "#"
+ XOr: "^", "⊻"
Not: "!", "~", "¬" - - As usual AND precedes OR and XOr. - - Multiple expressions can be separated by "," or ";". +

+

As usual AND precedes OR and XOr.

+

Multiple expressions can be separated by "," or ";". If you want to name the expressions you can use the - let command: "let U=A+B, let V=A*B". + let command: "let U=A+B, let V=A*B".

]]> Test vectors <html> diff --git a/src/main/resources/lang/lang_zh.xml b/src/main/resources/lang/lang_zh.xml index 5cc924120..d79e2eb16 100644 --- a/src/main/resources/lang/lang_zh.xml +++ b/src/main/resources/lang/lang_zh.xml @@ -836,14 +836,12 @@ 位 地址位 打开 PDF 文件时遇到错误！ - <h1>Digital</h1>一个简单的数字电路仿真器 - 作者： H. Neemann 2016-2020 - - 所用图标来自 <a href="http://tango.freedesktop.org">Tango Desktop Project</a> - - 在 <a href="https://github.com/hneemann/[[name]]">GitHub</a> 查看该项目，并<a href="https://github.com/hneemann/[[name]]/releases/latest">下载</a>最新的发行版 - - 可以在这里提交<a href="https://github.com/hneemann/[[name]]/issues/new?body=version:%20[[version]]&labels=bug">问题</a>或<a href="https://github.com/hneemann/[[name]]/issues/new?labels=enhancement">建议</a> + Digital +

一个简单的数字电路仿真器

+

作者： H. Neemann 2016-2020

+

所用图标来自 Tango Desktop Project

+

在 GitHub 查看该项目，并下载最新的发行版

+

可以在这里提交问题或建议

]]> {0} 结点 分析电路时遇到错误 颜色 @@ -1213,18 +1211,6 @@ 你可以查看有哪些功能变更。</p> <p>也可以直接 <a href="https://github.com/hneemann/[[name]]/releases/latest">下载</a> 最新版本</p> </html> - To define an expression you can use all most common notations: - - And: "&", "&&", "*", "∧" - Or: "|", "||", "+", "∨", "#" - XOr: "^", "⊻" - Not: "!", "~", "¬" - - As usual AND precedes OR and XOr. - - Multiple expressions can be separated by "," or ";". - If you want to name the expressions you can use the - let-command: "let U=A+B, let V=A*B" <html> <head><style>pre { background-color: #E0E0E0;}</style></head> <body> diff --git a/src/main/resources/lang/lang_zh_ref.xml b/src/main/resources/lang/lang_zh_ref.xml index 758ec07ce..28b4569f5 100644 --- a/src/main/resources/lang/lang_zh_ref.xml +++ b/src/main/resources/lang/lang_zh_ref.xml @@ -956,38 +956,37 @@ The ZIP file thus contains all the files that are necessary for the operation of the circuit. Label Inputs and Outputs Set a label to all inputs and outputs without a label. - Start Tutorial - Starts the beginner tutorial. - Circuit Statistics - Shows a list of used components. - Number - Component - Inputs - Bits - Addr. Bits - Error opening a PDF file! - <h1>Digital</h1>A simple simulator for digital circuits. - Written by H. Neemann in 2016-2020. - - The icons are taken from the <a href="http://tango.freedesktop.org">Tango Desktop Project</a>. - - Visit the project at <a href="https://github.com/hneemann/[[name]]">GitHub</a>. - At Github you can also <a href="https://github.com/hneemann/[[name]]/releases/latest">download</a> the - latest release. - - There you also can file an <a href="https://github.com/hneemann/[[name]]/issues/new?body=version:%20[[version]]&labels=bug">issue</a> - or suggest - an <a href="https://github.com/hneemann/[[name]]/issues/new?labels=enhancement">enhancement</a>. - {0} nodes - Error analysing the circuit - Color - Error creating the circuit - Error during simplification - Error during creation of hardware configuration. - Error editing a attribute value - Error importing the circuit {0}! - Error updating the component library!! - Error reading a file + Start Tutorial + Starts the beginner tutorial. + Circuit Statistics + Shows a list of used components. + Number + Component + Inputs + Bits + Addr. Bits + Error opening a PDF file! + Digital +

A simple simulator for digital circuits.

+

Written by H. Neemann in 2016-2020.

+

The icons are taken from the Tango Desktop Project.

+

Visit the project at GitHub. + At Github you can also download + the latest release.

+

There you also can file an issue + or suggest + an enhancement.

]]> + + {0} nodes + Error analysing the circuit + Color + Error creating the circuit + Error during simplification + Error during creation of hardware configuration. + Error editing a attribute value + Error importing the circuit {0}! + Error updating the component library!! + Error reading a file Command {0} unknown! Error writing a file The maximum frequency is {0} kHz @@ -1425,19 +1424,6 @@ you can find the changes and improvements.</p> <p>Here you can <a href="https://github.com/hneemann/[[name]]/releases/latest">download</a> the new release.</p> </html> - To define an expression you can use all most common notations: - - And: "&", "&&", "*", "∧" - Or: "|", "||", "+", "∨", "#" - XOr: "^", "⊻" - Not: "!", "~", "¬" - - As usual AND precedes OR and XOr. - - Multiple expressions can be separated by "," or ";". - If you want to name the expressions you can use the - let command: "let U=A+B, let V=A*B". - <html> <head><style>pre { background-color: #E0E0E0;}</style></head> <body>