Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:FPGAwars/icestudio into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
cavearr committed May 20, 2024
2 parents 86d767c + a665c38 commit 2285800
Show file tree
Hide file tree
Showing 17 changed files with 175 additions and 145 deletions.
28 changes: 15 additions & 13 deletions app/resources/locale/ca_ES/ca_ES.po
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,13 @@ msgstr "Bootloader no actiu"

#: app/scripts/controllers/menu.js:1365 app/views/design.html:508
#: app/views/menu.html:607
#, fuzzy
msgid "Build"
msgstr "Sintetitza"
msgstr "Síntetitza"

#: app/scripts/controllers/menu.js:1375
msgid "Build done"
msgstr "Sintetitzat realitzat"
msgstr "Síntesi realitzat"

#: app/scripts/app.js:58 app/scripts/services/project.js:161
#: app/scripts/services/utils.js:1384
Expand Down Expand Up @@ -439,6 +440,7 @@ msgid "Duplicate FPGA I/O ports"
msgstr "Ports d'E/S de la FPGA duplicats"

#: app/scripts/services/forms.js:1817
#, fuzzy
msgid "Duplicate port name: {{name}}"
msgstr ""

Expand Down Expand Up @@ -665,12 +667,12 @@ msgstr "Etiqueta d'entrada"
#: app/scripts/services/forms.js:1477
#, fuzzy
msgid "Input labels"
msgstr "Etiqueta d'entrada"
msgstr "Etiquetes d'entrada"

#: app/scripts/services/forms.js:1629
#, fuzzy
msgid "Input parameters"
msgstr "Introdueix els paràmetres"
msgstr "Paràmetres d'entrada"

#: app/scripts/services/forms.js:989
msgid "Input port name"
Expand All @@ -679,7 +681,7 @@ msgstr ""
#: app/scripts/services/forms.js:1615
#, fuzzy
msgid "Input ports"
msgstr "Introdueix els ports d'entrada"
msgstr "Ports d'entrada"

#: app/views/menu.html:635
#, fuzzy
Expand Down Expand Up @@ -794,7 +796,7 @@ msgstr ""
#: app/scripts/services/blockforms.js:1039
#, fuzzy
msgid "Label updated"
msgstr "Bloc actualitzat"
msgstr "Etiqueta actualitzada"

#: app/views/menu.html:359
msgid "Language"
Expand Down Expand Up @@ -848,7 +850,7 @@ msgstr "Memòria"
#: app/scripts/services/forms.js:1888
#, fuzzy
msgid "Memory blocks"
msgstr "Introdueix els blocs de memòria"
msgstr "Blocs de memòria"

#: app/scripts/services/utils.js:670
msgid "Name"
Expand Down Expand Up @@ -919,17 +921,17 @@ msgstr "Etiqueta d'eixida"
#: app/scripts/services/forms.js:1396
#, fuzzy
msgid "Output labels"
msgstr "Etiqueta d'eixida"
msgstr "Etiquetes d'eixida"

#: app/scripts/services/forms.js:1135
#, fuzzy
msgid "Output port name"
msgstr "Etiqueta d'eixida"
msgstr ""

#: app/scripts/services/forms.js:1622
#, fuzzy
msgid "Output ports"
msgstr "Etiqueta d'eixida"
msgstr "Ports de sortida"

#: app/views/design.html:301 app/views/menu.html:778
msgid "Paired labels"
Expand Down Expand Up @@ -1087,7 +1089,7 @@ msgstr ""

#: app/scripts/controllers/menu.js:1374
msgid "Start build"
msgstr "Inicia sintetitzat"
msgstr "Inicia síntesi"

#: app/scripts/controllers/menu.js:1400
msgid "Start upload"
Expand Down Expand Up @@ -1352,8 +1354,8 @@ msgstr ""
#: app/scripts/controllers/menu.js:409
#, fuzzy
msgid ""
"You are editing a submodule, so you will save just this submodule (\"Save "
"as\" works like \"Export module\"). Do you want to continue?"
"You are editing a submodule, so you will save just this submodule (\"Save as"
"\" works like \"Export module\"). Do you want to continue?"
msgstr ""
"Estàs editant un submòdul, si el deses, només es desarà el submòdul (en "
"aquesta situació \"anomena i desa\" funciona com \"exporta mòdul\"), Vols "
Expand Down
9 changes: 5 additions & 4 deletions app/resources/locale/cs_CZ/cs_CZ.po
Original file line number Diff line number Diff line change
Expand Up @@ -440,11 +440,12 @@ msgstr "Duplikovat"

#: app/scripts/services/tools.js:812
msgid "Duplicate FPGA I/O ports"
msgstr "Duplikované FPGA vstupně výstupní porty"
msgstr "Duplikované FPGA vstupně/výstupní porty"

#: app/scripts/services/forms.js:1817
#, fuzzy
msgid "Duplicate port name: {{name}}"
msgstr "Duplikovat popisek: {{name}}"
msgstr "Duplikovat jméno portu: {{name}}"

#: app/views/languages.html:44
msgid "Dutch"
Expand Down Expand Up @@ -1336,8 +1337,8 @@ msgstr ""

#: app/scripts/controllers/menu.js:409
msgid ""
"You are editing a submodule, so you will save just this submodule (\"Save "
"as\" works like \"Export module\"). Do you want to continue?"
"You are editing a submodule, so you will save just this submodule (\"Save as"
"\" works like \"Export module\"). Do you want to continue?"
msgstr ""
"Upravujete submodul, pokud bude ukládat, uložíte pouze submodul (v této "
"situaci \"uložit jako\" funguje jako \"exportovat modul\"). Chcete "
Expand Down
4 changes: 2 additions & 2 deletions app/resources/locale/de_DE/de_DE.po
Original file line number Diff line number Diff line change
Expand Up @@ -1352,8 +1352,8 @@ msgstr ""
#: app/scripts/controllers/menu.js:409
#, fuzzy
msgid ""
"You are editing a submodule, so you will save just this submodule (\"Save "
"as\" works like \"Export module\"). Do you want to continue?"
"You are editing a submodule, so you will save just this submodule (\"Save as"
"\" works like \"Export module\"). Do you want to continue?"
msgstr ""
"Du bearbeitest ein Untermodul. wenn du es speichert, wird nur das Untermodul "
"gespeichert. Möchtest du fortfahren ?"
Expand Down
22 changes: 10 additions & 12 deletions app/resources/locale/el_GR/el_GR.po
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ msgstr "Εισαγάγετε τη διαδρομή της εξωτερικής
#: app/scripts/services/forms.js:2383
#, fuzzy
msgid "Enter the external plugins path"
msgstr "Εισαγάγετε τη διαδρομή της εξωτερικής βιβλιοθήκης"
msgstr "Εισαγάγετε τη διαδρομή της εξωτερικής plugins"

#: app/scripts/services/forms.js:2337
#, fuzzy
Expand Down Expand Up @@ -534,12 +534,12 @@ msgstr "Οι εξωτερικές βιβλιοθήκες ανανεώθηκαν"
#: app/views/advanced.html:35
#, fuzzy
msgid "External plugins"
msgstr "Εξωτερικές βιβλιοθήκες"
msgstr "Εξωτερικές plugins"

#: app/scripts/controllers/menu.js:809
#, fuzzy
msgid "External plugins updated"
msgstr "Οι εξωτερικές βιβλιοθήκες ανανεώθηκαν"
msgstr "Οι εξωτερικές plugins ανανεώθηκαν"

#: app/scripts/services/tools.js:805
msgid "FPGA I/O ports not defined"
Expand Down Expand Up @@ -663,7 +663,7 @@ msgstr ""
#: app/scripts/services/forms.js:1477
#, fuzzy
msgid "Input labels"
msgstr "Εισαγάγετε τα blocks εισόδου"
msgstr ""

#: app/scripts/services/forms.js:1629
#, fuzzy
Expand Down Expand Up @@ -791,7 +791,7 @@ msgstr ""
#: app/scripts/services/blockforms.js:1039
#, fuzzy
msgid "Label updated"
msgstr "Το block ενημερώθηκε"
msgstr "Η ετικέτα ενημερώθηκε"

#: app/views/menu.html:359
msgid "Language"
Expand Down Expand Up @@ -845,7 +845,7 @@ msgstr "Μνήμη"
#: app/scripts/services/forms.js:1888
#, fuzzy
msgid "Memory blocks"
msgstr "Εισαγάγετε τα blocks μνήμης"
msgstr "Blocks μνήμης"

#: app/scripts/services/utils.js:670
msgid "Name"
Expand Down Expand Up @@ -914,18 +914,16 @@ msgid "Output label"
msgstr ""

#: app/scripts/services/forms.js:1396
#, fuzzy
msgid "Output labels"
msgstr "Έξοδος"
msgstr ""

#: app/scripts/services/forms.js:1135
msgid "Output port name"
msgstr ""

#: app/scripts/services/forms.js:1622
#, fuzzy
msgid "Output ports"
msgstr "Έξοδος"
msgstr ""

#: app/views/design.html:301 app/views/menu.html:778
msgid "Paired labels"
Expand Down Expand Up @@ -1343,8 +1341,8 @@ msgstr ""

#: app/scripts/controllers/menu.js:409
msgid ""
"You are editing a submodule, so you will save just this submodule (\"Save "
"as\" works like \"Export module\"). Do you want to continue?"
"You are editing a submodule, so you will save just this submodule (\"Save as"
"\" works like \"Export module\"). Do you want to continue?"
msgstr ""

#: app/scripts/services/utils.js:1350
Expand Down
9 changes: 4 additions & 5 deletions app/resources/locale/en/en.po
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ msgid "Basic"
msgstr "Basic"

#: app/views/design.html:275
#, fuzzy
msgid "Basic Toolbox"
msgstr "Basic Toolbox"

Expand Down Expand Up @@ -1326,11 +1325,11 @@ msgstr "Yes"

#: app/scripts/controllers/menu.js:409
msgid ""
"You are editing a submodule, so you will save just this submodule (\"Save "
"as\" works like \"Export module\"). Do you want to continue?"
"You are editing a submodule, so you will save just this submodule (\"Save as"
"\" works like \"Export module\"). Do you want to continue?"
msgstr ""
"You are editing a submodule, so you will save just this submodule (\"Save "
"as\" works like \"Export module\"). Do you want to continue?"
"You are editing a submodule, so you will save just this submodule (\"Save as"
"\" works like \"Export module\"). Do you want to continue?"

#: app/scripts/services/utils.js:1350
msgid "You are importing a block that uses \"tri-state\"."
Expand Down
7 changes: 2 additions & 5 deletions app/resources/locale/es_ES/es_ES.po
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ msgid "\"Inout\" pin"
msgstr "Puertos entrada/salida"

#: app/views/design.html:18
#, fuzzy
msgid ""
"<b>Read only</b><br>\n"
" Unlock to edit the block!"
Expand All @@ -38,7 +37,6 @@ msgid "<b>Unplug</b> and <b>reconnect</b> the board"
msgstr "<b>Desconecta</b> y <b>reconecta</b> la placa"

#: app/views/design.html:34
#, fuzzy
msgid ""
"<b>WARNING!</b><br>\n"
" The changes made here will also be applied to all the\n"
Expand Down Expand Up @@ -421,7 +419,6 @@ msgid "Documentation"
msgstr "Documentación"

#: app/views/version.html:65
#, fuzzy
msgid "Don’t display"
msgstr "No mostrar"

Expand Down Expand Up @@ -1349,8 +1346,8 @@ msgstr "Si"

#: app/scripts/controllers/menu.js:409
msgid ""
"You are editing a submodule, so you will save just this submodule (\"Save "
"as\" works like \"Export module\"). Do you want to continue?"
"You are editing a submodule, so you will save just this submodule (\"Save as"
"\" works like \"Export module\"). Do you want to continue?"
msgstr ""
"Estás editando un submódulo, aquí que guardarás solamente este submódulo "
"(\"Guardar como\" funciona como \"Exportar módulo\"). ¿Quieres continuar?"
Expand Down
10 changes: 5 additions & 5 deletions app/resources/locale/eu_ES/eu_ES.po
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ msgstr "Sarrera-etiketa"
#: app/scripts/services/forms.js:1629
#, fuzzy
msgid "Input parameters"
msgstr "Parametroak sar itzazu"
msgstr "Parametroak"

#: app/scripts/services/forms.js:989
msgid "Input port name"
Expand All @@ -684,7 +684,7 @@ msgstr ""
#: app/scripts/services/forms.js:1615
#, fuzzy
msgid "Input ports"
msgstr "Sarrerako portuak sar itzazu"
msgstr "Sarrerako portuak"

#: app/views/menu.html:635
#, fuzzy
Expand Down Expand Up @@ -852,7 +852,7 @@ msgstr "Memoria"
#: app/scripts/services/forms.js:1888
#, fuzzy
msgid "Memory blocks"
msgstr "Blokea inportatu"
msgstr ""

#: app/scripts/services/utils.js:670
msgid "Name"
Expand Down Expand Up @@ -1360,8 +1360,8 @@ msgstr ""
#: app/scripts/controllers/menu.js:409
#, fuzzy
msgid ""
"You are editing a submodule, so you will save just this submodule (\"Save "
"as\" works like \"Export module\"). Do you want to continue?"
"You are editing a submodule, so you will save just this submodule (\"Save as"
"\" works like \"Export module\"). Do you want to continue?"
msgstr ""
"Azpi modulua editatzen ari zara, gordetzen baduzu, azpimodulua gordeko duzu "
"soilik (hala bada, \"Gorde honela\" \"modulua esportatu\"ren antzera lan "
Expand Down
14 changes: 7 additions & 7 deletions app/resources/locale/fr_FR/fr_FR.po
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ msgstr "Constante"
#: app/scripts/services/forms.js:2103
#, fuzzy
msgid "Constant names"
msgstr "Constante"
msgstr "Noms de constantes"

#: app/scripts/services/project.js:103
msgid "Convert"
Expand Down Expand Up @@ -677,12 +677,12 @@ msgstr "Label d'entrée"
#: app/scripts/services/forms.js:1477
#, fuzzy
msgid "Input labels"
msgstr "Label d'entrée"
msgstr "Labels d'entrée"

#: app/scripts/services/forms.js:1629
#, fuzzy
msgid "Input parameters"
msgstr "Entrer les paramètres"
msgstr "Les paramètres d'entrée"

#: app/scripts/services/forms.js:989
msgid "Input port name"
Expand Down Expand Up @@ -865,7 +865,7 @@ msgstr "Mémoire"
#: app/scripts/services/forms.js:1888
#, fuzzy
msgid "Memory blocks"
msgstr "Importer un bloc"
msgstr "Blocs de mémoire"

#: app/scripts/services/utils.js:670
msgid "Name"
Expand Down Expand Up @@ -939,7 +939,7 @@ msgstr "Label de sortie"
#: app/scripts/services/forms.js:1396
#, fuzzy
msgid "Output labels"
msgstr "Label de sortie"
msgstr "Labels de sortie"

#: app/scripts/services/forms.js:1135
#, fuzzy
Expand Down Expand Up @@ -1377,8 +1377,8 @@ msgstr ""
#: app/scripts/controllers/menu.js:409
#, fuzzy
msgid ""
"You are editing a submodule, so you will save just this submodule (\"Save "
"as\" works like \"Export module\"). Do you want to continue?"
"You are editing a submodule, so you will save just this submodule (\"Save as"
"\" works like \"Export module\"). Do you want to continue?"
msgstr ""
"Vous êtes en train d'éditer un sous-module, si vous le sauvegardez, vous "
"sauvegardez uniquement le sous-module (dans ce cas, \"sauvegarder sous\" "
Expand Down
Loading

0 comments on commit 2285800

Please sign in to comment.