Skip to content

Commit

Permalink
v2.16.1.0, fixed broken characters, compiled with jdk 14
Browse files Browse the repository at this point in the history
  • Loading branch information
LogisimIt committed Apr 18, 2020
1 parent ba6a9ae commit 5e618a1
Show file tree
Hide file tree
Showing 28 changed files with 122 additions and 120 deletions.
Binary file modified Compiled/Logisim-ITA.exe
Binary file not shown.
Binary file modified Compiled/Logisim-ITA.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion Logisim-Fork/com/cburch/logisim/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

public class Main {
// current version
public static final LogisimVersion VERSION = LogisimVersion.get(2, 16, 0, 0, LogisimVersion.getVariantFromFile());
public static final LogisimVersion VERSION = LogisimVersion.get(2, 16, 1, 0, LogisimVersion.getVariantFromFile());
// the version of the file you're using, equals to current version if new file
public static LogisimVersion FILE_VERSION;

Expand Down
2 changes: 1 addition & 1 deletion Logisim-Fork/com/cburch/logisim/gui/start/About.java
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public void run() {
}
}

static final int IMAGE_WIDTH = 400;
static final int IMAGE_WIDTH = 425;

static final int IMAGE_HEIGHT = 250;

Expand Down
7 changes: 4 additions & 3 deletions Logisim-Fork/com/cburch/logisim/gui/start/AboutCredits.java
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,10 @@ public AboutCredits() {
"\u0443\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442 \u043F\u0435\u0447\u0430\u0442\u0438"));
lines.add(new CreditsLine(0, Strings.get("creditsRoleSimplifiedChinese")));
lines.add(new CreditsLine(1, "HUST Tiger"));
lines.add(new CreditsLine(2 , "\u751f\u4ea7\u961f\u7684\u5927\u841d\u535c"));
lines.add(new CreditsLine(2 , "\u4e2d\u56fd\u5927\u5b66\u6155\u8bfe\u300a\u8ba1\u7b97\u673a\u786c\u4ef6\u7cfb\u7edf\u8bbe\u8ba1\u300b"));
lines.add(new CreditsLine(2 , "Chenyang Chao"));
lines.add(new CreditsLine(2, "\u751f\u4ea7\u961f\u7684\u5927\u841d\u535c"));
lines.add(new CreditsLine(2,
"\u4e2d\u56fd\u5927\u5b66\u6155\u8bfe\u300a\u8ba1\u7b97\u673a\u786c\u4ef6\u7cfb\u7edf\u8bbe\u8ba1\u300b"));
lines.add(new CreditsLine(2, "Chenyang Chao"));
lines.add(new CreditsLine(0, Strings.get("creditsRoleTesting")));
lines.add(new CreditsLine(1, "Ilia Lilov"));
lines.add(new CreditsLine(2,
Expand Down
6 changes: 3 additions & 3 deletions Logisim-Fork/resources/logisim/de/start.properties
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ statsTotalWith= GESAMT (mit Teilschaltungen)
# Update Message
#
Update = Aktualisieren
Connectioncheck = Verbindung pr�fen
Connectioncheck = Verbindung prüfen
Installing = Installieren
UpdateMessage = Eine neue Logisim-Version (%s) ist verf�gbar!\nM�chten sie updaten?\n\n�nderungsprotokoll:%s
UpdateMessage = Eine neue Logisim-Version (%s) ist verfügbar!\nMöchten sie updaten?\n\nÄnderungsprotokoll:%s
UpdateFailed = Update fehlgeschlagen
NoUpdates = Keine Updates verf�gbar
NoUpdates = Keine Updates verfügbar
60 changes: 30 additions & 30 deletions Logisim-Fork/resources/logisim/fr/start.properties
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
#
# Startup.java
#
argTwoSubstitutionError = L'option "-sub" doit �tre suivir de deux para^m�tres.
argDuplicateSubstitutionError = Le m�me fichier ne peut pas �tre substitu� plusieurs fois.
ttyNeedsFileError = L'utilisation de "-tty" requi�re un nom de fichier sur la ligne de commande.
argTtyOption = -tty format ex�cuter sans interface graphique
argSubOption = -sub fichier1 fichier2 charger le fichier en rempla�ant la librairie fichier 1 par fichier 2
argTwoSubstitutionError = L'option "-sub" doit être suivir de deux para^mètres.
argDuplicateSubstitutionError = Le même fichier ne peut pas être substitué plusieurs fois.
ttyNeedsFileError = L'utilisation de "-tty" requière un nom de fichier sur la ligne de commande.
argTtyOption = -tty format exécuter sans interface graphique
argSubOption = -sub fichier1 fichier2 charger le fichier en remplaçant la librairie fichier 1 par fichier 2
argLoadOption = -load fichier charger le fichier image dans la RAM (fonctionne uniquement avec -tty)
loadNeedsFileError = l'utilisation de "-load" exige un fichier sur la ligne de commande.
loadNeedsTtyError = L'option "-load" fonctionne uniquement avec "-tty".
loadMultipleError = L'option "-load" ne peut �tre sp�cifi� qu'une seule fois.
ttyFormatError = -tty requi�re au moins l'une des options: halt, speed, stats, table, tty
loadMultipleError = L'option "-load" ne peut être spécifié qu'une seule fois.
ttyFormatError = -tty requière au moins l'une des options: halt, speed, stats, table, tty

argOneTemplateError = Un seul mod�le autoris�.
argOneTemplateError = Un seul modèle autorisé.
argUsage = usage: java %s [options] [filenames]
argOptionHeader = options:
argEmptyOption = -empty utiliser un mod�le vide
argPlainOption = -plain utiliser le mod�le logisim standard
argTemplateOption = -template fichier utiliser fichier comme mod�le
argEmptyOption = -empty utiliser un modèle vide
argPlainOption = -plain utiliser le modèle logisim standard
argTemplateOption = -template fichier utiliser fichier comme modèle
argGatesOption = -gates shaped|rectangular utiliser le style de porte logique
argLocaleOption = -locale str utiliser la locale sp�cifi�e
argAccentsOption = -accents yes|no utiliser les caract�res accentu�s ou le code ASCII �quivalent
argNoSplashOption = -nosplash cacher le splash au d�marrage
argLocaleOption = -locale str utiliser la locale spécifiée
argAccentsOption = -accents yes|no utiliser les caractères accentués ou le code ASCII équivalent
argNoSplashOption = -nosplash cacher le splash au démarrage
argVersionOption = -version afficher la version et terminer
argHelpOption = -help afficher cet aide et terminer
argClearOption = -clearprops effacer les pr�f�rences au d�marrage
argGatesOptionError = L'argument pour l'option -gate doit �tre "shaped" ou "rectangular".
argAccentsOptionError = L'argument pour l'option -accents doit �tre "yes" ou "no".
templateMissingError = Le fichier mod�le %s n'existe pas.
templateCannotReadError = Pas la permission de lire le fichier mod�le %s.
invalidLocaleError = La locale donn�e n'est pas support�e.
invalidLocaleOptionsHeader = Locales support�es:
argClearOption = -clearprops effacer les préférences au démarrage
argGatesOptionError = L'argument pour l'option -gate doit être "shaped" ou "rectangular".
argAccentsOptionError = L'argument pour l'option -accents doit être "yes" ou "no".
templateMissingError = Le fichier modèle %s n'existe pas.
templateCannotReadError = Pas la permission de lire le fichier modèle %s.
invalidLocaleError = La locale donnée n'est pas supportée.
invalidLocaleOptionsHeader = Locales supportées:
startupCancelButton = Annuler
startupCloseButton = Fermer
startupQuitButton = Quitter
Expand All @@ -47,7 +47,7 @@ progressFileCreate = Creating file...
progressFileLoad = Loading file...
progressProjectCreate = Creating project...
progressFrameCreate = Creating window...
creditsRoleLead = D�veloppeurs principaux
creditsRoleLead = Développeurs principaux
creditsRoleGerman = Traduction Allemande
creditsRoleGreek = Traduction Grecque
creditsRolePortuguese = Traduction Portugaise
Expand All @@ -61,19 +61,19 @@ creditsRoleOriginal = Original Version
#
ttyLoadError = Erreur dans le chargement du fichier circuit: %s
ttySpeedMsg = %s Hz (%s tics dans %s millisecondes)
loadNoRamError = Pas de RAM trouv�e pour l'option "-load".
loadNoRamError = Pas de RAM trouvée pour l'option "-load".
loadIoError = Erreur pendant la lecture du fichier image
ttyNoTtyError = Pas de TTY ou clavier n'a �t� trouv�.
ttyHaltReasonPin = arr�t� � cause du pin halt
ttyHaltReasonOscillation = arr�t� � cause de la d�taction d'une oscillation
ttyNoTtyError = Pas de TTY ou clavier n'a été trouvé.
ttyHaltReasonPin = arrêté à cause du pin halt
ttyHaltReasonOscillation = arrêté à cause de la détaction d'une oscillation
statsTotalWithout = TOTAL (sans les sous-circuits du projet)
statsTotalWith = TOTAL (avec les sous-circuits)
#
# Update Message
#
Update = Mise jour
Connectioncheck = V�rification de la connexion
Update = Mise à jour
Connectioncheck = Vérification de la connexion
Installing = Installation
UpdateMessage = Il y a une nouvelle version de Logisim (%s)\nVoulez-vous mettre ?our?\n\nChangelog:%s
UpdateFailed = Mise jour �chou�
NoUpdates = Aucune mise jour disponible
UpdateFailed = Mise à jour échoué
NoUpdates = Aucune mise à jour disponible
8 changes: 4 additions & 4 deletions Logisim-Fork/resources/logisim/it/start.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ argSubOption = -sub file1 file2 carica file sostituendo libreria file1 con
argLoadOption = -load file carica file immagine nella RAM (funziona solo con -tty)
loadNeedsFileError = Usare "-load" richiede un nome file fornito da riga di comando.
loadNeedsTtyError = L'opzione "-load" funziona solo insieme a "-tty".
loadMultipleError = L'opzione "-load" pu� essere specificata solo una volta.
loadMultipleError = L'opzione "-load" può essere specificata solo una volta.
ttyFormatError = -tty richiede almeno uno dei seguenti: halt, speed, stats, table, tty

argOneTemplateError = Permesso solo un modello.
Expand Down Expand Up @@ -52,7 +52,7 @@ creditsRoleGerman = Traduzione Tedesca
creditsRoleGreek = Traduzione Greca
creditsRolePortuguese = Traduzione Portoghese
creditsRoleRussian = Traduzione Russa
creditsRoleSimplifiedChinese = Traduzione Cinese semplificato
creditsRoleSimplifiedChinese = Traduzione Cinese Semplificato
creditsRoleItalian = Traduzione Italiana
creditsRoleTesting = Testing
creditsRoleOriginal = Versione Originale
Expand All @@ -61,7 +61,7 @@ creditsRoleOriginal = Versione Originale
#
ttyLoadError = Errore durante caricamento file circuito: %s
ttySpeedMsg = %s Hz (%s ticks in %s millisecondi)
loadNoRamError = Non stata trovata RAM per l'opzione "-load".
loadNoRamError = Non è stata trovata RAM per l'opzione "-load".
loadIoError = Errore durante la lettura del file immagine
ttyNoTtyError = Nessun componente TTY or Keyboard trovato.
ttyHaltReasonPin = interroto a causa dell'arresto del pin
Expand All @@ -74,6 +74,6 @@ statsTotalWith = TOTALE (con sottocircuiti)
Update = Aggiornamento
Connectioncheck = Verifico la connessione
Installing = Installazione
UpdateMessage = disponibile una nuova versione di Logisim (%s)\nVuoi aggiornare?\n\nChangelog:%s
UpdateMessage = È disponibile una nuova versione di Logisim (%s)\nVuoi aggiornare?\n\nChangelog:%s
UpdateFailed = Aggiornamento fallito
NoUpdates = Nessun aggiornamento disponibile
52 changes: 26 additions & 26 deletions Logisim-Fork/resources/logisim/pt/start.properties
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
#
# Startup.java
#
argTwoSubstitutionError= A op��o "-sub" deve ser seguida por dois par�metros.
argDuplicateSubstitutionError= Imposs�vel substituir o mesmo arquivo v�rias vezes.
ttyNeedsFileError= Ao usar "-tty" requerido fornecer um nome de arquivo pela linha de comando.
argTtyOption= -tty formato executar sem interface gr�fica
argTwoSubstitutionError= A opção "-sub" deve ser seguida por dois parâmetros.
argDuplicateSubstitutionError= Impossível substituir o mesmo arquivo várias vezes.
ttyNeedsFileError= Ao usar "-tty" é requerido fornecer um nome de arquivo pela linha de comando.
argTtyOption= -tty formato executar sem interface gráfica
argSubOption= -sub arquivo1 arquivo2 carregar arquivo substituindo a biblioteca do arquivo1 pela do arquivo2
argLoadOption= -load arquivo carregar arquivo de imagem na RAM (usar apenas com -tty)
loadNeedsFileError= Ao usar "-load" requerido fornecer um nome de arquivo pela linha de comando.
loadNeedsTtyError= A op��o "-load" deve ser usada em conjun��o com "-tty".
loadMultipleError= A op��o "-load" s� pode ser especificada uma vez.
loadNeedsFileError= Ao usar "-load" é requerido fornecer um nome de arquivo pela linha de comando.
loadNeedsTtyError= A opção "-load" deve ser usada em conjunção com "-tty".
loadMultipleError= A opção "-load" pode ser especificada uma vez.
ttyFormatError= -tty requer ao menos um dos seguintes: halt, speed, stats, table, tty

argOneTemplateError= Somente permitido um gabarito.
argUsage= uso: java %s [options] [filenames]
argOptionHeader= op��es:
argOptionHeader= opções:
argEmptyOption= -empty usar gabarito vazio
argPlainOption= -plain usar gabarito padr�o do Logisim
argPlainOption= -plain usar gabarito padrão do Logisim
argTemplateOption= -template arquivo usar arquivo com gabarito
argGatesOption= -gates shaped|rectangular usar estilo de porta especificado
argLocaleOption= -locale str usar defini��o regional dada por str
argLocaleOption= -locale str usar definição regional dada por str
argAccentsOption= -accents yes|no usar caracteres acentuados ou equivalentes ASCII
argNoSplashOption= -nosplash ocultar cr�ditos de abertura ao iniciar
argVersionOption= -version exibir n�mero da vers�o e sair
argNoSplashOption= -nosplash ocultar créditos de abertura ao iniciar
argVersionOption= -version exibir número da versão e sair
argHelpOption= -help exibir este resumo e sair
argClearOption= -clearprops limpar prefer�ncias para a aplica��o ao iniciar
argGatesOptionError= Argumento para a op��o -gates deve ser "shaped" ou "rectangular".
Expand All @@ -48,32 +48,32 @@ progressFileLoad= Carregar arquivo...
progressProjectCreate= Criar projeto...
progressFrameCreate= Criar janela...
creditsRoleLead= Desenvolvedores principal
creditsRoleGerman= Tradu��o para o alem�o
creditsRoleGreek = Tradu��o para o grego
creditsRolePortuguese= Tradu��o para o portugu�s
creditsRoleRussian= Tradu��o para o russo
creditsRoleSimplifiedChinese = Tradu��o para o Chinês simplificado
creditsRoleItalian= Tradu��o para o italiano
creditsRoleGerman= Tradução para o alemão
creditsRoleGreek = Tradução para o grego
creditsRolePortuguese= Tradução para o português
creditsRoleRussian= Tradução para o russo
creditsRoleSimplifiedChinese = Tradução para o Chinês simplificado
creditsRoleItalian= Tradução para o italiano
creditsRoleTesting= Testes
creditsRoleOriginal= Vers�o original
creditsRoleOriginal= Versão original
#
# TtyInterface.java
#
ttyLoadError= Erro ao carregar o arquivo: %s
ttySpeedMsg= %s Hz (%s pulsos em %s milisegundos)
loadNoRamError= Nenhuma RAM foi encontrada para a op��o "-load".
loadNoRamError= Nenhuma RAM foi encontrada para a opção "-load".
loadIoError= Erro ao ler o arquivo imagem
ttyNoTtyError= Nenhum componente TTY ou Keyboard encontrado.
ttyHaltReasonPin= suspenso devido ao pino halt
ttyHaltReasonOscillation= suspenso devido � detec��o de oscila��o
ttyHaltReasonOscillation= suspenso devido à detecção de oscilação
statsTotalWithout= TOTAL (sem subcircuitos do projeto)
statsTotalWith= TOTAL (com subcircuitos)
#
# Update Message
#
Update = Atualiza��o
Connectioncheck = Verificando conex�o
Update = Atualização
Connectioncheck = Verificando conexão
Installing = Instalando
UpdateMessage = H� uma nova vers�o do Logisim (%s)\nVoc� quer atualizar?\n\nAltera��es(Changelog):%s
UpdateFailed = Falha na atualiza��o
NoUpdates = N�o h� atualiza��es dispon�veis
UpdateMessage = uma nova versão do Logisim (%s)\nVocê quer atualizar?\n\nAlterações(Changelog):%s
UpdateFailed = Falha na atualização
NoUpdates = Não há atualizações disponíveis
2 changes: 1 addition & 1 deletion Logisim-Fork/resources/logisim/settings.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
locales = de el en es fr pt ru it zh-CN
locales = de el en es fr pt ru it zh
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
#
# util/FontUtil.java
#
fontPlainStyle = \u6807\u51c6
fontBoldStyle = \u7c97\u4f53
fontItalicStyle = \u659c\u4f53
fontBoldItalicStyle = \u7c97\u659c\u4f53



#
# util/InputEventUtil.java
#
metaMod = Meta
altMod = Alt
ctrlMod = Ctrl
shiftMod = Shift
button1Mod = Button1
button2Mod = Button2
button3Mod = Button3
#
# util/JDialogOk.java
#
dlogOkButton = \u786e\u8ba4
dlogCancelButton = \u53d6\u6d88
#
# util/LocaleManager.java
#
# If the user selects to "replace accented characters" in the International
# dialog, the program will replace accented characters based on
# the slash-delimited character-string pairs in accentReplacements.
# For example, with German, accentReplacements might be
# "? oe/? Oe/? ue/? ue/? ss" so that umlauted o's and u's are
# replaced, as would be essets.
accentReplacements =
#
# util/GifEncoder.java
#
grabberError = Grabber returned false:
manyColorError = Too many colors.
#
# util/WindowMenu.java
#
windowMenu = \u7a97\u53e3
windowMinimizeItem = \u6700\u5c0f\u5316
windowZoomItem = \u6700\u5927\u5316
windowZoomItemMac = \u653e\u5927
windowCloseItem = \u5173\u95ed

#
# util/FontUtil.java
#
fontPlainStyle = \u6807\u51c6
fontBoldStyle = \u7c97\u4f53
fontItalicStyle = \u659c\u4f53
fontBoldItalicStyle = \u7c97\u659c\u4f53



#
# util/InputEventUtil.java
#
metaMod = Meta
altMod = Alt
ctrlMod = Ctrl
shiftMod = Shift
button1Mod = Button1
button2Mod = Button2
button3Mod = Button3
#
# util/JDialogOk.java
#
dlogOkButton = \u786e\u8ba4
dlogCancelButton = \u53d6\u6d88
#
# util/LocaleManager.java
#
# If the user selects to "replace accented characters" in the International
# dialog, the program will replace accented characters based on
# the slash-delimited character-string pairs in accentReplacements.
# For example, with German, accentReplacements might be
# "? oe/? Oe/? ue/? ue/? ss" so that umlauted o's and u's are
# replaced, as would be essets.
accentReplacements =
#
# util/GifEncoder.java
#
grabberError = Grabber returned false:
manyColorError = Too many colors.
#
# util/WindowMenu.java
#
windowMenu = \u7a97\u53e3
windowMinimizeItem = \u6700\u5c0f\u5316
windowZoomItem = \u6700\u5927\u5316
windowZoomItemMac = \u653e\u5927
windowCloseItem = \u5173\u95ed

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ This is an italian fork based on the original Logisim version.<br>
* Constantly supported and listening to all your suggestions/reports
## Changelog
* Core Stuff:
* Italian and partial french translation!
* Italian, Simplified Chinese and partial french translation!
* Autoupdates!
* Compiled with Java 13
* Compiled with Java 14
* Complete new movement system with mouse dragging
* Auto center and Auto zoom when opening new files/circuits or with ctrl-0, double mouse wheel click and with the round button you'll see on the lower-right corner
* Almost infinite canvas, arrows will show you in what direction is the circuit if it's outside of your view
Expand Down
1 change: 1 addition & 0 deletions version.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
<exe_version>2.16.1.0</exe_version>
<changelog>
* Added Simplified Chinese translation
* Compiled with Jdk 14
</changelog>
</logisim>

0 comments on commit 5e618a1

Please sign in to comment.