Skip to content

Commit

Permalink
Merge branch 'develop' into Dutch
Browse files Browse the repository at this point in the history
  • Loading branch information
TimRudy committed May 21, 2024
2 parents 0740ee1 + 8a2780d commit 3dd368e
Show file tree
Hide file tree
Showing 20 changed files with 143 additions and 190 deletions.
77 changes: 0 additions & 77 deletions .github/workflows/main-osx.yml

This file was deleted.

7 changes: 5 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -541,11 +541,14 @@ module.exports = function (grunt) {
//--- Read if there is a platform argument set
//--- If not, the default target is Linux64

// Verifica el script npm que se está ejecutando
const npmLifecycleEvent = process.env.npmLifecycleEvent;

let platform = grunt.option("platform") || false;
let ocpu = grunt.option("cpu");
let cpu = (typeof ocpu !== 'undefined' && ocpu !== false && ocpu !== '') ? ocpu : process.arch;
const cpuIsARM = (cpu === 'arm64');
console.log('CPU', cpu);
console.log('CPU', cpu, 'NPM', npmLifecycleEvent);
//-- Aditional options for the platforms
let options = { scope: ["devDependencies"] };

Expand Down Expand Up @@ -707,7 +710,7 @@ module.exports = function (grunt) {
grunt.registerTask("serve", [
"nggettext_compile", //-- Get the translation in json files
"watch:scripts", //-- Watch the given files. When there is change
//-- Icestudio is restarted
//-- Icestudio is restarted
]);

// grunt dist: Create the app package
Expand Down
17 changes: 9 additions & 8 deletions app/resources/locale/ca_ES/ca_ES.po
Original file line number Diff line number Diff line change
Expand Up @@ -675,8 +675,9 @@ msgid "Input parameters"
msgstr "Paràmetres d'entrada"

#: app/scripts/services/forms.js:989
msgid "Input port name"
msgstr ""
#, fuzzy
msgid "Input port names"
msgstr "Noms dels ports d'entrada"

#: app/scripts/services/forms.js:1615
#, fuzzy
Expand Down Expand Up @@ -849,15 +850,15 @@ msgstr "Memòria"

#: app/scripts/services/forms.js:1888
#, fuzzy
msgid "Memory blocks"
msgstr "Blocs de memòria"
msgid "Memory block names"
msgstr "Noms de blocs de memòria"

#: app/scripts/services/utils.js:670
msgid "Name"
msgstr "Nom"

#: app/scripts/services/forms.js:1539
msgid "Name of the paired labels"
msgid "Names of the paired labels"
msgstr ""

#: app/scripts/services/forms.js:444 app/views/design.html:248
Expand Down Expand Up @@ -925,8 +926,8 @@ msgstr "Etiquetes d'eixida"

#: app/scripts/services/forms.js:1135
#, fuzzy
msgid "Output port name"
msgstr ""
msgid "Output port names"
msgstr "Noms dels ports de sortida"

#: app/scripts/services/forms.js:1622
#, fuzzy
Expand Down Expand Up @@ -989,7 +990,7 @@ msgstr "Tanca"
#: app/scripts/services/forms.js:390 app/views/design.html:115
#, fuzzy
msgid "Red"
msgstr "Refés"
msgstr ""

#: app/views/menu.html:238
msgid "Redo"
Expand Down
15 changes: 8 additions & 7 deletions app/resources/locale/cs_CZ/cs_CZ.po
Original file line number Diff line number Diff line change
Expand Up @@ -667,8 +667,8 @@ msgstr "Vstupní parametry"

#: app/scripts/services/forms.js:989
#, fuzzy
msgid "Input port name"
msgstr "Název vstupu"
msgid "Input port names"
msgstr "Názvy vstupních portů"

#: app/scripts/services/forms.js:1615
#, fuzzy
Expand Down Expand Up @@ -837,15 +837,16 @@ msgid "Memory"
msgstr "Paměť"

#: app/scripts/services/forms.js:1888
msgid "Memory blocks"
msgstr "Paměťové bloky"
#, fuzzy
msgid "Memory block names"
msgstr "Názvy bloků paměti"

#: app/scripts/services/utils.js:670
msgid "Name"
msgstr "Jméno"

#: app/scripts/services/forms.js:1539
msgid "Name of the paired labels"
msgid "Names of the paired labels"
msgstr "Názvy párovaných popisků"

#: app/scripts/services/forms.js:444 app/views/design.html:248
Expand Down Expand Up @@ -912,8 +913,8 @@ msgstr "Popisky výstupů"

#: app/scripts/services/forms.js:1135
#, fuzzy
msgid "Output port name"
msgstr "Název výstupu"
msgid "Output port names"
msgstr "Názvy výstupních portů"

#: app/scripts/services/forms.js:1622
#, fuzzy
Expand Down
30 changes: 19 additions & 11 deletions app/resources/locale/de_DE/de_DE.po
Original file line number Diff line number Diff line change
Expand Up @@ -651,21 +651,23 @@ msgid "Input"
msgstr "Eingang"

#: app/views/design.html:291 app/views/menu.html:769
#, fuzzy
msgid "Input label"
msgstr "Eingangs-Beschriftung"
msgstr "Eingangs-Label"

#: app/scripts/services/forms.js:1477
#, fuzzy
msgid "Input labels"
msgstr "Eingangs-Beschriftung"
msgstr "Eingangs-Labels"

#: app/scripts/services/forms.js:1629
msgid "Input parameters"
msgstr "Eingangs-Parameter"

#: app/scripts/services/forms.js:989
#, fuzzy
msgid "Input port name"
msgstr "Eingangs Port-Name"
msgid "Input port names"
msgstr "Eingangs-Port-Namen"

#: app/scripts/services/forms.js:1615
msgid "Input ports"
Expand Down Expand Up @@ -839,16 +841,18 @@ msgid "Memory"
msgstr "Speicher"

#: app/scripts/services/forms.js:1888
msgid "Memory blocks"
msgstr "Speicher Blöcke"
#, fuzzy
msgid "Memory block names"
msgstr "Namen von Speicherblöcken"

#: app/scripts/services/utils.js:670
msgid "Name"
msgstr "Name"

#: app/scripts/services/forms.js:1539
msgid "Name of the paired labels"
msgstr "Name der verknüpften Labels"
#, fuzzy
msgid "Names of the paired labels"
msgstr "Namen der verknüpften Labels"

#: app/scripts/services/forms.js:444 app/views/design.html:248
msgid "Navy"
Expand Down Expand Up @@ -907,22 +911,26 @@ msgid "Output"
msgstr "Ausgang"

#: app/views/design.html:296 app/views/menu.html:773
#, fuzzy
msgid "Output label"
msgstr "Ausgangs-Beschriftung"
msgstr "Ausgangs-Label"

#: app/scripts/services/forms.js:1396
#, fuzzy
msgid "Output labels"
msgstr "Ausgangs-Labels"

#: app/scripts/services/forms.js:1135
msgid "Output port name"
msgstr "Ausgangs-Port Name"
#, fuzzy
msgid "Output port names"
msgstr "Ausgangs-Port-Namen"

#: app/scripts/services/forms.js:1622
msgid "Output ports"
msgstr "Ausgangs-Port"

#: app/views/design.html:301 app/views/menu.html:778
#, fuzzy
msgid "Paired labels"
msgstr "Verknüpfte Labels"

Expand Down
12 changes: 7 additions & 5 deletions app/resources/locale/el_GR/el_GR.po
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ msgid "Input parameters"
msgstr "Εισαγάγετε τις παραμέτρους"

#: app/scripts/services/forms.js:989
msgid "Input port name"
msgid "Input port names"
msgstr ""

#: app/scripts/services/forms.js:1615
Expand Down Expand Up @@ -844,15 +844,15 @@ msgstr "Μνήμη"

#: app/scripts/services/forms.js:1888
#, fuzzy
msgid "Memory blocks"
msgid "Memory block names"
msgstr "Blocks μνήμης"

#: app/scripts/services/utils.js:670
msgid "Name"
msgstr "Όνομα"

#: app/scripts/services/forms.js:1539
msgid "Name of the paired labels"
msgid "Names of the paired labels"
msgstr ""

#: app/scripts/services/forms.js:444 app/views/design.html:248
Expand Down Expand Up @@ -914,14 +914,16 @@ msgid "Output label"
msgstr ""

#: app/scripts/services/forms.js:1396
#, fuzzy
msgid "Output labels"
msgstr ""

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

#: app/scripts/services/forms.js:1622
#, fuzzy
msgid "Output ports"
msgstr ""

Expand Down Expand Up @@ -982,7 +984,7 @@ msgstr "Έξοδος"
#: app/scripts/services/forms.js:390 app/views/design.html:115
#, fuzzy
msgid "Red"
msgstr "Επανάληψη"
msgstr ""

#: app/views/menu.html:238
msgid "Redo"
Expand Down
16 changes: 8 additions & 8 deletions app/resources/locale/en/en.po
Original file line number Diff line number Diff line change
Expand Up @@ -665,8 +665,8 @@ msgid "Input parameters"
msgstr "Input parameters"

#: app/scripts/services/forms.js:989
msgid "Input port name"
msgstr "Input port name"
msgid "Input port names"
msgstr "Input port names"

#: app/scripts/services/forms.js:1615
msgid "Input ports"
Expand Down Expand Up @@ -828,16 +828,16 @@ msgid "Memory"
msgstr "Memory"

#: app/scripts/services/forms.js:1888
msgid "Memory blocks"
msgstr "Memory blocks"
msgid "Memory block names"
msgstr "Memory block names"

#: app/scripts/services/utils.js:670
msgid "Name"
msgstr "Name"

#: app/scripts/services/forms.js:1539
msgid "Name of the paired labels"
msgstr "Name of the paired labels"
msgid "Names of the paired labels"
msgstr "Names of the paired labels"

#: app/scripts/services/forms.js:444 app/views/design.html:248
msgid "Navy"
Expand Down Expand Up @@ -901,8 +901,8 @@ msgid "Output labels"
msgstr "Output labels"

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

#: app/scripts/services/forms.js:1622
msgid "Output ports"
Expand Down
Loading

0 comments on commit 3dd368e

Please sign in to comment.