[omega] 1.21.0 Public Beta 1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,27 +1,14 @@
 ---
 name: Bug report
-about: Upsilon is not working like it should? Let us know!
+about: Omega is not working like it should? Let us know!
 title: ''
-labels: 'Status: Triage, Type: Bug'
+labels: Bug, Triage
 assignees: ''
 
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+#### Describe the bug
 
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - Upsilon Version: [go to settings > about > Upsilon Version and type the version here]
+#### Environment
+ - Omega Version: {go to settings > about > Omega Version and type the version here}

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,17 +1,10 @@
 ---
 name: Feature request
-about: Suggest an idea for Upsilon
+about: Suggest an idea for an improvement of Omega
 title: ''
-labels: 'Status: Triage, Type: Feature'
+labels: Feature, Triage
 assignees: ''
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
+#### What I want to see in the next version of Omega

.github/ISSUE_TEMPLATE/other.md

@@ -1,8 +1,8 @@
 ---
 name: Other
-about: A question? A problem? …
+about: A question? A problem? ...
 title: ''
-labels: 'Status: Triage'
+labels: Triage
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/problems-during-installation.md

@@ -1,19 +1,19 @@
 ---
 name: Problems during installation
-about: Need help to install Upsilon?
+about: Need help to install Omega?
 title: ''
-labels: 'Status: Triage, Type: Installation issue'
+labels: Installation issue, Triage
 assignees: ''
 
 ---
 
-**Describe the problem**
+#### Describe the problem
 
 
-**Logs**
+#### Logs
 ```
 Copy/paste the logs here (If you have some)
 ```
 
-**Environment**
- - Upsilon Version: {go to settings > about > Upsilon Version and type the version here}
+#### Environment
+ - Omega Version: {go to settings > about > Omega Version and type the version here}

.github/workflows/ci-workflow.yml

@@ -1,7 +1,6 @@
 name: Continuous integration
 #on: [pull_request, push]
 on:
-  push:
   pull_request:
   workflow_dispatch:
     inputs:
@@ -13,42 +12,32 @@ on:
         description: 'Run macOS tests'
         required: true
         default: 'no'
-      trigger3DS:
-        description: 'Run 3DS tests'
-        required: true
-        default: 'no'
 
 jobs:
-  nintendo_3ds:
-    if: github.event.inputs.trigger3DS == 'yes'
-    runs-on: ubuntu-latest
-    steps:
-      - run: wget https://github.com/devkitPro/pacman/releases/download/v1.0.2/devkitpro-pacman.amd64.deb -O /tmp/devkitpro-pacman.deb
-      - run: yes | sudo dpkg -i /tmp/devkitpro-pacman.deb
-      - run: yes | sudo dkp-pacman -Syu --needed devkitARM 3dstools libctru
-      - run: echo ::set-env name=DEVKITPRO::/opt/devkitpro
-      - run: echo ::set-env name=DEVKITARM::/opt/devkitpro/devkitARM
-      - run: echo ::set-env name=PATH::$DEVKITPRO/tools/bin:$DEVKITARM/bin:$PATH
+  # nintendo_3ds:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - run: wget https://github.com/devkitPro/pacman/releases/download/v1.0.2/devkitpro-pacman.amd64.deb -O /tmp/devkitpro-pacman.deb
+  #     - run: yes | sudo dpkg -i /tmp/devkitpro-pacman.deb
+  #     - run: yes | sudo dkp-pacman -Syu --needed devkitARM 3dstools libctru
+  #     - run: echo ::set-env name=DEVKITPRO::/opt/devkitpro
+  #     - run: echo ::set-env name=DEVKITARM::/opt/devkitpro/devkitARM
+  #     - run: echo ::set-env name=PATH::$DEVKITPRO/tools/bin:$DEVKITARM/bin:$PATH
 
-      - uses: actions/checkout@v1
-        with:
-          submodules: true
-      - run: make -j2 PLATFORM=simulator TARGET=3ds
-      - run: make -j2 PLATFORM=simulator TARGET=3ds epsilon.cia
-      - uses: actions/upload-artifact@master
-        with:
-          name: epsilon-3ds.3dsx
-          path: output/release/simulator/3ds/epsilon.3dsx
-      - uses: actions/upload-artifact@master
-        with:
-          name: epsilon-3ds.cia
-          path: output/release/simulator/3ds/epsilon.cia
+  #     - uses: actions/checkout@v1
+  #       with:
+  #         submodules: true
+  #     - run: make -j2 PLATFORM=simulator TARGET=3ds
+  #     - uses: actions/upload-artifact@master
+  #       with:
+  #         name: epsilon-3ds.3dsx
+  #         path: output/release/simulator/3ds/epsilon.3dsx
   android:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v1
         with:
-          submodules: 'recursive'
+          submodules: true
       - run: make -j2 PLATFORM=simulator TARGET=android
       - uses: actions/upload-artifact@master
         with:
@@ -59,9 +48,9 @@ jobs:
     steps:
       - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
       - uses: numworks/setup-arm-toolchain@2020-q2
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v1
         with:
-          submodules: 'recursive'
+          submodules: true
       - run: mkdir final-output
       - run: make -j2 MODEL=n0100 EPSILON_I18N=en output/release/device/n0100/epsilon.onboarding.two_binaries
       - run: mv output/release/device/n0100/epsilon.onboarding.internal.bin final-output/epsilon.onboarding.internal.en.bin
@@ -100,9 +89,9 @@ jobs:
     steps:
       - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
       - uses: numworks/setup-arm-toolchain@2020-q2
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v1
         with:
-          submodules: 'recursive'
+          submodules: true
       - run: make -j2 epsilon.dfu
       - run: make -j2 epsilon.onboarding.dfu
       - run: make -j2 epsilon.onboarding.update.dfu
@@ -125,12 +114,11 @@ jobs:
     steps:
       - uses: msys2/setup-msys2@v2
       - uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
       - run: pacman -S --noconfirm mingw-w64-x86_64-gcc mingw-w64-x86_64-freetype mingw-w64-x86_64-pkg-config make mingw-w64-x86_64-python3 mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-libpng
       - run: make -j2 PLATFORM=simulator
-      - run: make -j2 PLATFORM=simulator test.exe
-      - run: cmd /c output\release\simulator\windows\test.exe --headless
+      - run: make -j2 PLATFORM=simulator epsilon.official.exe
+      - run: make -j2 PLATFORM=simulator test.headless.exe
+      - run: output/release/simulator/windows/test.headless.exe
       - uses: actions/upload-artifact@master
         with:
           name: epsilon-windows.exe
@@ -140,13 +128,11 @@ jobs:
     steps:
       - uses: numworks/setup-emscripten@v1
         with:
-          sdk: 1.40.1-fastcomp
-      - uses: actions/checkout@v2
+          sdk: latest-upstream
+      - uses: actions/checkout@v1
         with:
-          submodules: 'recursive'
+          submodules: true
       - run: make -j2 PLATFORM=simulator TARGET=web
-      - run: make -j2 PLATFORM=simulator TARGET=web test.js
-      - run: node output/release/simulator/web/test.js --headless
       - uses: actions/upload-artifact@master
         with:
           name: epsilon-web.zip
@@ -155,27 +141,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v1
         with:
-          submodules: 'recursive'
+          submodules: true
       - run: make -j2 PLATFORM=simulator
-      - run: make -j2 PLATFORM=simulator test.bin
-      - run: output/release/simulator/linux/test.bin --headless
       - uses: actions/upload-artifact@master
         with:
           name: epsilon-linux.bin
           path: output/release/simulator/linux/epsilon.bin
+      - run: make -j2 PLATFORM=simulator test.headless.bin
   macos:
     if: github.event.inputs.triggerMacos == 'yes'
     runs-on: macOS-latest
     steps:
       - run: brew install numworks/tap/epsilon-sdk
       - uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
       - run: make -j2 PLATFORM=simulator
-      - run: make -j2 PLATFORM=simulator ARCH=x86_64 test.bin
-      - run: output/release/simulator/macos/x86_64/test.bin --headless
+      - run: make -j2 PLATFORM=simulator epsilon.official.app
+      - run: make -j2 PLATFORM=simulator ARCH=x86_64 test.headless.bin
+      - run: output/release/simulator/macos/x86_64/test.headless.bin
       - uses: actions/upload-artifact@master
         with:
           name: epsilon-macos.zip
@@ -186,9 +170,9 @@ jobs:
     steps:
       - run: brew install numworks/tap/epsilon-sdk
       - uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
       - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0
+      - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0 epsilon.official.ipa
+      - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0 test.ipa
       - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0 APPLE_PLATFORM=ios-simulator
       - uses: actions/upload-artifact@master
         with:

.github/workflows/metric-workflow.yml

@@ -31,6 +31,7 @@ jobs:
       - name: Add comment
         uses: actions/github-script@v3.0.0
         with:
+          github-token: ${{ secrets.OMEGA_ROBOT_TOKEN }}
           script: |
             await github.issues.createComment({
               owner: context.repo.owner,

.gitignore

@@ -6,5 +6,3 @@ epsilon.map
 .vscode
 .DS_Store
 .gradle
-.idea/
-.vs

.gitlab-ci.yml

@@ -0,0 +1,26 @@
+image: gcc
+
+stages:
+  - build
+
+job:build:
+    stage: build
+    before_script:
+        - "echo 'deb http://httpredir.debian.org/debian jessie main contrib \n deb-src http://httpredir.debian.org/debian jessie main contrib \n deb http://httpredir.debian.org/debian jessie-updates main contrib \n deb-src http://httpredir.debian.org/debian jessie-updates main contrib \n deb http://security.debian.org/ jessie/updates main contrib \n deb-src http://security.debian.org/ jessie/updates main contrib ' > /etc/apt/source.list"
+        - "apt-get update"
+        - "apt -y install build-essential git imagemagick libx11-dev libxext-dev libfreetype6-dev libpng-dev libjpeg-dev pkg-config fltk1.3-dev gcc-arm-none-eabi nodejs npm"
+        - "git submodule update --init --recursive"
+        - "git clone https://github.com/RedGl0w/omega-auto-increment"
+        - "cd omega-auto-increment"
+        - "npm i request exeq"
+        - "PrivateToken=$PrivateToken node index.js"
+        - "cd .."
+    script:
+        - make clean
+        - make MODEL=n0100 epsilon.bin
+    artifacts:
+        paths:
+            - output/release/device/n0100/epsilon.bin
+            - omega-auto-increment/version.txt
+        name: artifact:build:simulator
+        

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "apps/rpn"]
 	path = apps/rpn
-	url = https://github.com/Lauryy06/Upsilon-RPN.git
-[submodule "apps/atomic"]
-	path = apps/atomic
-	url = https://github.com/Lauryy06/atomic
+	url = https://github.com/Omega-Numworks/Omega-RPN.git
+[submodule "apps/atom"]
+	path = apps/atom
+	url = https://github.com/Omega-Numworks/Omega-Atom.git

Makefile

@@ -12,21 +12,6 @@ include build/toolchain.$(TOOLCHAIN).mak
 include build/variants.mak
 include build/helpers.mk
 
-ifeq (${MODEL}, n0100)
-  ifeq ($(filter reader,$(apps_list)),)
-  	$(warning reader app included, removing it on n0100. )
-  	EPSILON_APPS := $(filter-out reader,$(EPSILON_APPS))
-  endif
-  ifneq ($(words $(EPSILON_I18N)), 1)
-  	$(warning Only use 1 language on n0100, defaulting to en. )
-  	EPSILON_I18N := en
-  endif
-  ifeq ($(INCLUDE_ULAB), 1)
-    $(warning Removing uLab on n0100. )
-    INCLUDE_ULAB := 0
-  endif
-endif
-
 ifeq (${MODEL}, n0110)
   apps_list = ${EPSILON_APPS}
 else
@@ -37,10 +22,6 @@ ifdef FORCE_EXTERNAL
   apps_list = ${EPSILON_APPS}
 endif
 
-ifeq ($(INCLUDE_ULAB), 1)
-  SFLAGS += -DINCLUDE_ULAB
-endif
-
 ifdef HOME_DISPLAY_EXTERNALS
   ifneq ($(filter external,$(apps_list)),)
     SFLAGS += -DHOME_DISPLAY_EXTERNALS

README.fr.md

@@ -1,183 +0,0 @@
-<p align="center"><img src="https://github.com/Laporte12974/UpsilonDesign/blob/89a15953ae128aef8aa7d066dcaaf8d5c70f02a5/UPSILogo.png" /></p>
-
-<p align="center">
-  <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="cc by-nc-sa 4.0" src="https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-525252.svg?labelColor=292929&logo=creative%20commons&style=for-the-badge" /></a>
-  <a href="https://github.com/Lauryy06/Upsilon/issues"><img alt="Issues" src="https://img.shields.io/github/issues/Lauryy06/Upsilon.svg?labelColor=292929&logo=git&style=for-the-badge" /></a>
-  <br/>
-  <a href="https://discord.gg/Q9buEMduXG"><img alt="Discord" src="https://img.shields.io/discord/663420259851567114?color=blue&labelColor=292929&label=chat%20-%20discord&logo=discord&style=for-the-badge" /></a>
-</p>
-
-> Don't understand french ? speak english ? here's the [english README](./README.md) !
-
-## À propos
-
-Upsilon est un fork d'Omega, un fork d'Epsilon, l'OS de Numworks tournant sur les calculatrices du même nom, qui apporte beaucoup de fonctionnalités en plus, mais qui fut archivé et fermé pour des raisons légales après un changement de politique de Numworks. Upsilon est fait pour ceux qui aimeraient voir un futur pour les OS créées par les utilisateurs pour Numworks, même après l'arrèt du projet initial.
-
-### Quelques fonctionnalités supplémentaires
-- Un module python kandinsky amélioré
-- Un support pour fonds d'écrans personnalisés
-- Des applications externes
-- Un thème Upsilon
-- La surcharge des opérateurs en python
-- Un tableau périodique légèrement amélioré
-- L'utilisation possible du signe "=" dans les calculs
-- *Ainsi que tout ce qui a été ajouté sur Omega, et bien plus...* [Changelogs complets d'Omega](https://github.com/Omega-Numworks/Omega/wiki/Changelog) | [Fonctionnalités principales d'Omega & captures d'écran](https://github.com/Omega-Numworks/Omega/wiki/Main-features).
-
-## Installation
-
-### Manuelle
-
-*A l'heure actuelle, seule l'installation manuelle est possible.*
-
-Tout d'abord, suivez **la première étape** [ici](https://www.numworks.com/resources/engineering/software/build/), puis :
-
-<details>
-  <summary><b>Modèle n0100</b></summary>
-
-(note : vous pouvez changer `EPSILON_I18N=fr` en `en`, `nl`, `pt`, `it`, `de`, `es` ou `hu`).
-
-```bash
-git clone --recursive https://github.com/Lauryy06/Upsilon.git
-cd Upsilon
-git checkout omega-master
-make MODEL=n0100 clean
-make MODEL=n0100 EPSILON_I18N=fr OMEGA_USERNAME="{Votre nom ici, 15 caractères max}" -j4
-make MODEL=n0100 epsilon_flash
-```
-
-Important : N'oubliez pas l'argument `--recursive`, Upsilon a besoin de sous-modules.
-Vous pouvez aussi changer le nombre de processus parallèles pendant la compilation en changeant la valeur suivant `-j`.
-
-</details>
-
-<details>
-  <summary><b>Modèle n0110</b></summary>
-
-```bash
-git clone --recursive https://github.com/Lauryy06/Upsilon.git
-cd Upsilon
-git checkout omega-master
-make clean
-make OMEGA_USERNAME="{Votre nom ici, 15 caractères max}" -j4
-make epsilon_flash
-```
-
-Important : N'oubliez pas l'argument `--recursive`, Upsilon a besoin de sous-modules.
-Vous pouvez aussi changer le nombre de processus parallèles pendant la compilation en changeant la valeur suivant `-j`.
-
-</details>
-
-<details>
-  <summary><b>Fichiers binaires</b></summary>
-  
-Ces fichiers peuvent être utilisés pour distribuer Upsilon (pour que tout le monde puisse le flasher via [Webdfu_Numworks](https://ti-planet.github.io/webdfu_numworks/)).
-
-```bash
-git clone --recursive https://github.com/Lauryy06/Upsilon.git
-cd Upsilon
-git checkout omega-master
-make clean
-make MODEL=n0100 OMEGA_USERNAME="" -j8
-make MODEL=n0100 OMEGA_USERNAME="" binpack -j8
-make OMEGA_USERNAME="" -j8
-make OMEGA_USERNAME="" binpack -j8
-```
-
-Important : N'oubliez pas l'argument `--recursive`, Upsilon a besoin de sous-modules.
-Vous pouvez aussi changer le nombre de processus parallèles pendant la compilation en changeant la valeur suivant `-j`.
-  
-</details>
-
-<details>
-  <summary><b>Simulateur web</b></summary>
-  
-D'abord, installez emsdk :
-
-```bash
-git clone https://github.com/emscripten-core/emsdk.git
-cd emsdk
-./emsdk install latest-fastcomp
-./emsdk activate latest-fastcomp
-source emsdk_env.sh
-```
-
-Puis, compilez Upsilon :
-
-```bash
-git clone --recursive https://github.com/Lauryy06/Upsilon.git
-cd Upsilon
-git checkout omega-master
-make clean
-make PLATFORM=simulator TARGET=web OMEGA_USERNAME="{Votre nom ici, 15 caractères max}" -j4
-```
-
-Le simulateur se trouve dans `output/release/simulator/web/simulator.zip`
-
-Important : N'oubliez pas l'argument `--recursive`, Upsilon a besoin de sous-modules.
-Vous pouvez aussi changer le nombre de processus parallèles pendant la compilation en changeant la valeur suivant `-j`.
-
-</details>
-
-<details>
-  <summary><b>Simulateur 3DS</b></summary>
-  
-Vous aurez besoin de devkitPro et de devkitARM disponible dans votre `$PATH` (instructions [ici](https://devkitpro.org/wiki/Getting_Started) (en anglais))
-
-```bash
-git clone --recursive https://github.com/Lauryy06/Upsilon.git
-cd Upsilon
-git checkout --recursive upsilon-dev
-make PLATFORM=simulator TARGET=3ds -j
-```
-
-Vous pouvez ensuite copier epsilon.3dsx sur une carte SD pour l'exécuter depuis le HBC ou utiliser 3dslink pour le lancer via le réseau :
-
-```bash
-3dslink output/release/simulator/3ds/epsilon.3dsx -a <ADRESSE IP 3DS>
-```
-
-</details>
-
-Si vous avez besoin d'aide, n'hésitez pas à rejoindre notre serveur discord : https://discord.gg/Q9buEMduXG
-
-<a href="https://discord.gg/Q9buEMduXG"><p align="center"><img alt="Omega Banner Discord" src="https://user-images.githubusercontent.com/12123721/86287349-54ef5800-bbe8-11ea-80c1-34eb1f93eebd.png" /></p></a>
----
-
-## Liens utiles
-* [Upsilon external (pour installer des applications supplémentaires et des fonds d'écran)](https://lauryy06.github.io/Upsilon-External/)
-* [Documentation d'ulab](https://micropython-ulab.readthedocs.io/en/latest/)
-
-## Contribution
-
-Pour contribuer, merci de lire le [Wiki d'Omega](https://github.com/Omega-Numworks/Omega/wiki/Contributing), les mêmes règles s'appliquent ici.
-
-## Les autres projets
-
-Les anciens projets d'Omega, avant sa fermeture, qui ont été utilisés pour ce projet
-
-* [Omega Themes](https://github.com/Omega-Numworks/Omega-Themes)
-* [Omega Website](https://github.com/Omega-Numworks/Omega-Website)
-* [Omega RPN `APP`](https://github.com/Omega-Numworks/Omega-RPN)
-* [Omega Atomic `APP`](https://github.com/Omega-Numworks/Omega-Atomic)
-* [Omega Design](https://github.com/Omega-Numworks/Omega-Design)
-* [Omega Discord Bot](https://github.com/Omega-Numworks/Omega-Discord-Bot)
-* [Omega App Template `BETA`](https://github.com/Omega-Numworks/Omega-App-Template)
-* [External Apps](https://github.com/Omega-Numworks/External-Apps)
-
-## À propos d'Epsilon
-
-Upsilon est un fork d'Omega, visant a continuer le projet des OS utilisateurs pour Numworks
-
-Omega est un fork d'Epsilon, un système d'exploitation performant pour calculatrices graphiques. Il inclut huit applications pour les mathématiques de lycée et d'études supérieurs
-
-Vous pouvez essayer Epsilon depuis votre navigateur sur le [simulateur en ligne](https://www.numworks.com/simulator/).
-
-## Licence
-
-NumWorks est une marque déposée de NumWorks SAS, 24 Rue Godot de Mauroy, 75009 Paris, France.
-Nintendo est Nintendo 3DS sont des marques déposées de Nintendo of America Inc, 4600 150th Ave NE, Redmond, WA 98052, Etats-Unis.
-NumWorks SAS et Nintendo of America Inc ne sont en aucun cas associés avec ce projet.
-
-* NumWorks Epsilon est disponible sous [Lisense CC BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode).
-* Omega est disponible sous [Lisense CC BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode).
-* Upsilon est disponible sous [Lisense CC BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode).

README.md

@@ -1,156 +1,36 @@
-<p align="center"><img src="https://github.com/Laporte12974/UpsilonDesign/blob/89a15953ae128aef8aa7d066dcaaf8d5c70f02a5/UPSILogo.png" /></p>
+<p align="center"><img src="https://user-images.githubusercontent.com/12123721/106272451-60b00500-6231-11eb-8521-09fe93b3b1f4.png" /></p>
 
 <p align="center">
   <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="cc by-nc-sa 4.0" src="https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-525252.svg?labelColor=292929&logo=creative%20commons&style=for-the-badge" /></a>
-  <a href="https://github.com/Lauryy06/Upsilon/issues"><img alt="Issues" src="https://img.shields.io/github/issues/Lauryy06/Upsilon.svg?labelColor=292929&logo=git&style=for-the-badge" /></a>
+  <a href="https://github.com/Omega-Numworks/Omega/issues"><img alt="Issues" src="https://img.shields.io/github/issues/Omega-Numworks/Omega.svg?labelColor=292929&logo=git&style=for-the-badge" /></a>
   <br/>
-  <a href="https://discord.gg/Q9buEMduXG"><img alt="Discord" src="https://img.shields.io/discord/663420259851567114?color=blue&labelColor=292929&label=chat%20-%20discord&logo=discord&style=for-the-badge" /></a>
+  <a href="https://discord.gg/X2TWhh9"><img alt="Discord" src="https://img.shields.io/discord/663420259851567114?color=blue&labelColor=292929&label=chat%20-%20discord&logo=discord&style=for-the-badge" /></a>
 </p>
 
-> Vous ne comprenez pas l'anglais ? Vous êtes francophone ? Regardez le [*LISEZ-MOI* français](./README.fr.md) !
-
 ## About
 
-Upsilon is a fork of Omega, an user-made OS that runs on the Numworks calculator, which brings many features to it, but was discontinued because of a policy change from Numworks. Upsilon is for the people who want to see a future for user-made OSes for Numworks, even after the closure and archiving of Omega.
-
-
-
+Omega is a fork of Numworks' Epsilon, the OS that runs on their calculator, which brings many features to it. Omega is for the people who want to add features to the calculator, but cannot because they have been rejected by Numworks (for reasons that are 100% understandable!). [Try it online](https://getomega.web.app/simulator).
 
 ### Some new features
-- Enhancements for the Kandinsky python module
-- Support for wallpapers
+- Adding symbolic calculation back into the calculator
+- An app for RPN
 - Exernal apps
-- A custom theme
-- Operator overload for python
-- Improvements for the Periodic table application
-- *And everything that has been added to Omega before its termination!* [See Omega's changelog here](https://github.com/Omega-Numworks/Omega/wiki/Changelog) | [Main Omega features + screenshots](https://github.com/Omega-Numworks/Omega/wiki/Main-features).
-
-<br>
+- A theme engine
+- New python features (os module, open method...)
+- A periodic table app + all of the molar masses for the elements in the toolbox
+- *And much more to discover...* [Complete changelog](https://github.com/Omega-Numworks/Omega/wiki/Changelog) | [Main new features + screenshots](https://github.com/Omega-Numworks/Omega/wiki/Main-features).
 
 ## Installation
 
+### Automatic
+
+You can install Omega automatically on our website [here](https://getomega.web.app/) in the "install" page.
+
+<a href="https://getomega.web.app"><p align="center"><img alt="Omega Banner Discord" src="https://user-images.githubusercontent.com/12123721/86352956-e9000480-bc66-11ea-82b7-79fd7e56fa27.png" /></p></a>
+
 ### Manual
 
-*As of today, only the manual installation is available. You can refer to this [website](https://www.numworks.com/resources/engineering/software/build/) for the first step if you get errors.*
-
-
-
-### 1. Install SDK
-
-<br>
-
-<details>
-<summary><b>1.1 Linux</b></summary>
-
-<br>
-
-
-<details>
-<summary>Debian or Ubuntu</summary>
-
-<br>
-
-You just have to install dependencies by running these command with superuser privileges in a Terminal:
-
-```bash
-apt-get install build-essential git imagemagick libx11-dev libxext-dev libfreetype6-dev libpng-dev libjpeg-dev pkg-config gcc-arm-none-eabi binutils-arm-none-eabi
-```
-
-And there you can go to step 2!
-
-<br>
-
-</details>
-
-<details>
-<summary>Fedora</summary>
-
-<br>
-
-First install basics dev tools.
-
-```bash
-dnf install make automake gcc gcc-c++ kernel-devel
-```
-
-Then install required packages.
-
-```bash
-dnf install git ImageMagick libX11-devel libXext-devel freetype-devel libpng-devel libjpeg-devel pkg-config
-```
-
-Then, install GCC cross compiler for ARM.
-
-```bash
-dnf install arm-none-eabi-gcc-cs arm-none-eabi-gcc-cs-c++
-```
-
-<br>
-
-</details>
-
-<br>
-
-</details>
-
-<details>
-<summary><b>1.2 Mac</b></summary>
-
-<br>
-
-It's recommended to use [Homebrew](https://brew.sh/). Once it's installed, just run:
-```bash
-brew install numworks/tap/epsilon-sdk
-```
-and it will install all dependencies.
-
-<br>
-
-And there you can go to step 2!
-
-<br>
-
-
-
-</details>
-
-<details>
-<summary><b>1.3 Windows</b></summary>
-
-<br>
-
-[Msys2](https://www.msys2.org/) environment is recommended to get most of the required tools on Windows easily. It's where you'll paste all the commands of this tutorial. Once it's installed, paste these commands into the Msys2 terminal.
-
-```bash
-pacman -S mingw-w64-x86_64-gcc mingw-w64-x86_64-freetype mingw-w64-x86_64-pkg-config mingw-w64-x86_64-libusb git make python
-echo "export PATH=/mingw64/bin:$PATH" >> .bashrc
-```
-
-Next, you'll need to install the [GCC toolchain for ARM](https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads). When prompted for an install location, choose `C:\msys64\home\User\gcc-arm\`. You'll then need to add this folder to your $PATH. Just enter:
-
-```bash
-echo "export PATH=$PATH:$HOME/gcc-arm/bin" >> .bashrc
-```
-Just restart and you can go to step 2!
-</details>
-
-<br>
-
-### 2. Set up repo
-
-
-Clone repo and use 'upsilon-dev' branch by pasting these two commands:
-
-```bash
-git clone --recursive https://github.com/Lauryy06/Upsilon.git
-cd Upsilon
-git checkout upsilon-dev
-```
-<br>
-
-
-### 3. Choose the target
-
+First of all, follow **step 1** [here](https://www.numworks.com/resources/engineering/software/build/). Then:
 
 <details>
   <summary><b>Model n0100</b></summary>
@@ -158,53 +38,55 @@ git checkout upsilon-dev
 (note: you can change the `EPSILON_I18N=en` flag to `fr`, `nl`, `pt`, `it`, `de`, `es` or `hu`).
 
 ```bash
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout omega-master
 make MODEL=n0100 clean
 make MODEL=n0100 EPSILON_I18N=en OMEGA_USERNAME="{Your name, max 15 characters}" -j4
-```
-
-Now, run either:
-
-```bash
 make MODEL=n0100 epsilon_flash
 ```
-to directly flash the calculator after pressing simultaneously `reset` and `6` buttons and pluging in.
 
-<br>
-
-or:
-
-```bash
-make MODEL=n0100 OMEGA_USERNAME="" binpack -j4
-```
-to make binpack wich you can flash to the caculator from [Ti-planet's webDFU](https://ti-planet.github.io/webdfu_numworks/n0100/). Binpacks are a great way to share a custom build of Upsilon to friends.
+Important: Don't forget the `--recursive` tag, because Omega relies on submodules.
+Also, you can change the number of processes that run in parallel during the build by changing the value of the `-j` flag.
   
 </details>
 
 <details>
   <summary><b>Model n0110</b></summary>
 
-
 ```bash
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout omega-master
 make clean
 make OMEGA_USERNAME="{Your name, max 15 characters}" -j4
-```
-
-Now, run either:
-
-```bash
 make epsilon_flash
 ```
-to directly flash the calculator after pressing simultaneously `reset` and `6` buttons and pluging in.
 
-<br>
+Important: Don't forget the `--recursive` tag, because Omega relies on submodules.
+Also, you can change the number of processes that run in parallel during the build by changing the value of the `-j` flag.
+  
+</details>
 
-or:
+<details>
+  <summary><b>Bin files</b></summary>
+  
+These can be used to distribute Omega (so that it can be flashed by anyone with [Webdfu_Numworks](https://ti-planet.github.io/webdfu_numworks/)).
 
 ```bash
-make OMEGA_USERNAME="" binpack -j4
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout omega-master
+make clean
+make MODEL=n0100 OMEGA_USERNAME="" -j8
+make MODEL=n0100 OMEGA_USERNAME="" binpack -j8
+make OMEGA_USERNAME="" -j8
+make OMEGA_USERNAME="" binpack -j8
 ```
-to make binpack wich you can flash to the caculator from [Ti-planet's webDFU](https://ti-planet.github.io/webdfu_numworks/n0110/). Binpacks are a great way to share a custom build of Upsilon to friends.
 
+Important: Don't forget the `--recursive` tag, because Omega relies on submodules.
+Also, you can change the number of processes that run in parallel during the build by changing the value of the `-j` flag.
+  
 </details>
 
 <details>
@@ -220,15 +102,20 @@ cd emsdk
 source emsdk_env.sh
 ```
 
-Then, compile Upsilon :
+Then, compile Omega :
 
 ```bash
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout omega-master
 make clean
 make PLATFORM=simulator TARGET=web OMEGA_USERNAME="{Your name, max 15 characters}" -j4
 ```
 
 The simulator is now in `output/release/simulator/web/simulator.zip`
 
+Important: Don't forget the `--recursive` tag, because Omega relies on submodules.
+Also, you can change the number of processes that run in parallel during the build by changing the value of the `-j` flag.
 
 </details>
 
@@ -238,9 +125,9 @@ The simulator is now in `output/release/simulator/web/simulator.zip`
 You need devkitPro and devkitARM installed and in your path (instructions [here](https://devkitpro.org/wiki/Getting_Started))
 
 ```bash
-git clone --recursive https://github.com/Lauryy06/Upsilon.git
-cd Upsilon
-git checkout --recursive upsilon-dev
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout --recursive omega-dev
 make PLATFORM=simulator TARGET=3ds -j
 ```
 You can then put epsilon.3dsx on a SD card to run it from the HBC or use 3dslink to launch it over the network:
@@ -251,34 +138,21 @@ You can then put epsilon.3dsx on a SD card to run it from the HBC or use 3dslink
 
 </details>
 
-<br>
+If you need help, you can join our Discord server here : https://discord.gg/X2TWhh9
 
-Important: Don't forget the `--recursive` tag, because Upsilon relies on submodules.
-Also, you can change the number of processes that run in parallel during the build by changing the value of the `-j` flag.
-Don't forget to put your pseudo instead of `{your pseudo, max 15 char}`. If you don't want one, just remove the `OMEGA_USERNAME=""` argument.
-
-<br>
-
-If you need help, you can join our Discord server here : https://discord.gg/NFvzdCBTQn
-
-<a href="https://discord.gg/NFvzdCBTQn"><p align="center"><img alt="Omega Banner Discord" src="https://user-images.githubusercontent.com/12123721/86287349-54ef5800-bbe8-11ea-80c1-34eb1f93eebd.png" /></p></a>
+<a href="https://discord.gg/X2TWhh9"><p align="center"><img alt="Omega Banner Discord" src="https://user-images.githubusercontent.com/12123721/86287349-54ef5800-bbe8-11ea-80c1-34eb1f93eebd.png" /></p></a>
 ---
-## Useful links
-* [Upsilon external (to install additional apps and wallpapers)](https://lauryy06.github.io/Upsilon-External/)
-* [Ulab documentation](https://micropython-ulab.readthedocs.io/en/latest/)
 
 ## Contributing
 
-To contribute, please refer to [Omega's Wiki](https://github.com/Omega-Numworks/Omega/wiki/Contributing), the same rules apply here.
-  
-## Related repositories
+To contribute, please refer to the [Wiki](https://github.com/Omega-Numworks/Omega/wiki/Contributing)
 
-Here are the main links toward Omega's different websites and repositories, that have been used for the creation of Upsilon.
+## Related repositories
 
 * [Omega Themes](https://github.com/Omega-Numworks/Omega-Themes)
 * [Omega Website](https://github.com/Omega-Numworks/Omega-Website)
 * [Omega RPN `APP`](https://github.com/Omega-Numworks/Omega-RPN)
-* [Omega Atomic `APP`](https://github.com/Omega-Numworks/Omega-Atomic)
+* [Omega Atom `APP`](https://github.com/Omega-Numworks/Omega-Atom)
 * [Omega Design](https://github.com/Omega-Numworks/Omega-Design)
 * [Omega Discord Bot](https://github.com/Omega-Numworks/Omega-Discord-Bot)
 * [Omega App Template `BETA`](https://github.com/Omega-Numworks/Omega-App-Template)
@@ -286,8 +160,6 @@ Here are the main links toward Omega's different websites and repositories, that
 
 ## About Epsilon
 
-Upsilon is a fork of Omega, after the project's discontinuation.
-
 Omega is a fork of Epsilon, a high-performance graphing calculator operating system. It includes eight apps that cover the high school mathematics curriculum.
 
 You can try Epsilon straight from your browser in the [online simulator](https://www.numworks.com/simulator/).
@@ -300,4 +172,3 @@ NumWorks SAS and Nintendo of America Inc aren't associated in any shape or form
 
 * NumWorks Epsilon is released under a [CC BY-NC-SA License](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode).
 * Omega is released under a [CC BY-NC-SA License](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode).
-* Upsilon is released under a [CC BY-NC-SA License](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode).

apps/Makefile

@@ -11,25 +11,6 @@ apps =
 # (path to the apps header).
 $(foreach i,${apps_list},${eval include apps/$(i)/Makefile})
 
-app_equals = $(and $(findstring $(1),$(2)),$(findstring $(2),$(1)))
-# We list all the apps that are missing
-apps_missing = $(foreach i, ${apps_list}, $(if $(call app_equals, apps/$(i)/Makefile, $(wildcard apps/$(i)/Makefile)),, $(i) ) )
-
-# If the two doesn't match, we got an error.
-ifneq ($(strip $(apps_missing)),)
-    miss_modules = 0
-
-    # Check if the missing apps are one that are supposed to be submodules
-    $(foreach i, $(SUBMODULES_APPS), $(if $(call app_equals, $(filter $(i), $(apps_missing)), $(i)), $(eval miss_modules=1)))
-
-    ifeq ($(miss_modules), 1)
-        PLS_IGNORE := $(shell >&2 printf "\nSome submodules apps seem to be missing. To download them, assumming you git clone'd the repo, do\n")
-        PLS_IGNORE := $(shell >&2 printf "  git submodule init\n")
-        PLS_IGNORE := $(shell >&2 printf "  git submodule update\n\n")
-    endif
-    $(error Missing apps: $(strip $(apps_missing)))
-endif
-
 apps_src += $(addprefix apps/,\
   alternate_empty_nested_menu_controller.cpp \
   apps_container.cpp \
@@ -62,7 +43,7 @@ apps_src += $(addprefix apps/,\
 )
 
 tests_src += $(addprefix apps/,\
-  exam_mode_configuration_non_official.cpp \
+  exam_mode_configuration_official.cpp \
 )
 
 
@@ -85,6 +66,9 @@ language_preferences = apps/language_preferences.csv
 SFLAGS += -I$(BUILD_DIR)
 
 i18n_files += $(addprefix apps/language_,$(addsuffix .universal.i18n, $(EPSILON_I18N)))
+ifeq ($(EPSILON_GETOPT),1)
+i18n_files += $(addprefix apps/language_,$(addsuffix _iso6391.universal.i18n, $(EPSILON_I18N)))
+endif
 
 i18n_files += $(call i18n_with_universal_for,shared)
 i18n_files += $(call i18n_with_universal_for,toolbox)
@@ -94,7 +78,7 @@ $(eval $(call rule_for, \
   I18N, \
   apps/i18n.cpp, \
   $(i18n_files), \
-  $$(PYTHON) apps/i18n.py --codepoints $(code_points) --countrypreferences $(country_preferences) --languagepreferences $(language_preferences) --header $$(subst .cpp,.h,$$@) --implementation $$@ --locales $$(EPSILON_I18N) --countries $$(EPSILON_COUNTRIES) --files $$^, \
+  $$(PYTHON) apps/i18n.py --codepoints $(code_points) --countrypreferences $(country_preferences) --languagepreferences $(language_preferences) --header $$(subst .cpp,.h,$$@) --implementation $$@ --locales $$(EPSILON_I18N) --countries $$(EPSILON_COUNTRIES) --files $$^ --generateISO6391locales $$(EPSILON_GETOPT), \
   global \
 ))
 
@@ -107,11 +91,8 @@ $(BUILD_DIR)/apps/i18n.h: $(BUILD_DIR)/apps/i18n.cpp
 $(eval $(call depends_on_image,apps/title_bar_view.cpp,apps/exam_icon.png))
 
 $(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/apps/i18n.h
-$(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/apps/home/apps_layout.h
 $(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/python/port/genhdr/qstrdefs.generated.h
 
-$(call object_for,$(apps_src)): $(BUILD_DIR)/apps/home/apps_layout.h
-
 apps_tests_src = $(app_calculation_test_src) $(app_code_test_src) $(app_graph_test_src) $(app_probability_test_src) $(app_regression_test_src) $(app_sequence_test_src) $(app_shared_test_src) $(app_statistics_test_src) $(app_settings_test_src) $(app_solver_test_src)
 
 apps_tests_src += $(addprefix apps/,\

apps/apps_container.cpp

@@ -8,8 +8,6 @@
 #include <ion/backlight.h>
 #include <poincare/preferences.h>
 
-#include <algorithm>
-
 extern "C" {
 #include <assert.h>
 }
@@ -29,7 +27,7 @@ AppsContainer::AppsContainer() :
   m_globalContext(),
   m_variableBoxController(),
   m_examPopUpController(this),
-  m_promptController(k_promptMessages, k_promptFGColors, k_promptBGColors, k_promptNumberOfMessages),
+  m_promptController(k_promptMessages, k_promptColors, k_promptNumberOfMessages),
   m_batteryTimer(),
   m_suspendTimer(),
   m_backlightDimmingTimer(),
@@ -198,7 +196,7 @@ bool AppsContainer::dispatchEvent(Ion::Events::Event event) {
       }
       if (changedZoom) {
         KDIonContext::sharedContext()->updatePostProcessingEffects();
-        redrawWindow(true);
+        redrawWindow();
         return true;
       }
     }
@@ -220,13 +218,6 @@ bool AppsContainer::dispatchEvent(Ion::Events::Event event) {
   return didProcessEvent || alphaLockWantsRedraw;
 }
 
-static constexpr Ion::Events::Event switch_events[] = {
-    Ion::Events::ShiftSeven, Ion::Events::ShiftEight, Ion::Events::ShiftNine,
-    Ion::Events::ShiftFour, Ion::Events::ShiftFive, Ion::Events::ShiftSix,
-    Ion::Events::ShiftOne, Ion::Events::ShiftTwo, Ion::Events::ShiftThree,
-    Ion::Events::ShiftZero, Ion::Events::ShiftDot, Ion::Events::ShiftEE
-};
-
 bool AppsContainer::processEvent(Ion::Events::Event event) {
   // Warning: if the window is dirtied, you need to call window()->redraw()
   if (event == Ion::Events::USBPlug) {
@@ -251,15 +242,6 @@ bool AppsContainer::processEvent(Ion::Events::Event event) {
     switchTo(appSnapshotAtIndex(1));
     return true;
   }
-
-  for(int i = 0; i < std::min((int) (sizeof(switch_events) / sizeof(Ion::Events::Event)), APPS_CONTAINER_SNAPSHOT_COUNT); i++) {
-    if (event == switch_events[i]) {
-      m_window.redraw(true);
-      switchTo(appSnapshotAtIndex(i+1));
-      return true;
-    }
-  }
-
   if (event == Ion::Events::OnOff) {
     suspend(true);
     return true;

apps/apps_container.h

@@ -66,8 +66,7 @@ private:
   bool updateAlphaLock();
 
   static I18n::Message k_promptMessages[];
-  static KDColor k_promptFGColors[];
-  static KDColor k_promptBGColors[];
+  static KDColor k_promptColors[];
   static int k_promptNumberOfMessages;
   AppsWindow m_window;
   EmptyBatteryWindow m_emptyBatteryWindow;

apps/apps_container_prompt_beta.cpp

@@ -10,7 +10,7 @@ I18n::Message AppsContainer::k_promptMessages[] = {
   I18n::Message::BetaVersionMessage5,
   I18n::Message::BetaVersionMessage6};
 
-KDColor AppsContainer::k_promptFGColors[] = {
+KDColor AppsContainer::k_promptColors[] = {
   KDColorBlack,
   KDColorBlack,
   KDColorBlack,
@@ -20,14 +20,4 @@ KDColor AppsContainer::k_promptFGColors[] = {
   KDColorBlack,
   Palette::AccentText};
 
-KDColor AppsContainer::k_promptBGColors[] = {
-    KDColorWhite,
-    KDColorWhite,
-    KDColorWhite,
-    KDColorWhite,
-    KDColorWhite,
-    KDColorWhite,
-    KDColorWhite,
-    KDColorWhite};
-
 int AppsContainer::k_promptNumberOfMessages = 8;

apps/apps_container_prompt_none.cpp

@@ -2,8 +2,7 @@
 
 I18n::Message AppsContainer::k_promptMessages[] = {};
 
-KDColor AppsContainer::k_promptFGColors[] = {};
-KDColor AppsContainer::k_promptBGColors[] = {};
+KDColor AppsContainer::k_promptColors[] = {};
 
 int AppsContainer::k_promptNumberOfMessages = 0;
 

apps/apps_container_prompt_update.cpp

@@ -8,7 +8,7 @@ I18n::Message AppsContainer::k_promptMessages[] = {
   I18n::Message::UpdateMessage3,
   I18n::Message::UpdateMessage4};
 
-KDColor AppsContainer::k_promptFGColors[] = {
+KDColor AppsContainer::k_promptColors[] = {
   KDColorBlack,
   KDColorBlack,
   KDColorBlack,
@@ -16,12 +16,4 @@ KDColor AppsContainer::k_promptFGColors[] = {
   KDColorBlack,
   Palette::AccentText};
 
-KDColor AppsContainer::k_promptBGColors[] = {
-    KDColorWhite,
-    KDColorWhite,
-    KDColorWhite,
-    KDColorBlack,
-    KDColorWhite,
-    KDColorBlack};
-
 int AppsContainer::k_promptNumberOfMessages = 6;

apps/battery_view.cpp

@@ -75,13 +75,13 @@ void BatteryView::drawRect(KDContext * ctx, KDRect rect) const {
     assert(!m_isPlugged);
     // Low: Quite empty battery
     ctx->fillRect(KDRect(batteryInsideX, 0, 2*k_elementWidth, k_batteryHeight), Palette::BatteryLow);
-    ctx->fillRect(KDRect(3*k_elementWidth+k_separatorThickness, 0, k_batteryWidth-5*k_elementWidth-2*k_separatorThickness, k_batteryHeight), KDColor::blend(Palette::Toolbar, Palette::Battery, 128));
+    ctx->fillRect(KDRect(3*k_elementWidth+k_separatorThickness, 0, k_batteryWidth-5*k_elementWidth-2*k_separatorThickness, k_batteryHeight), Palette::BatteryInCharge);
   } else if (m_chargeState == Ion::Battery::Charge::SOMEWHERE_INBETWEEN) {
     assert(!m_isPlugged);
     // Middle: Half full battery
     constexpr KDCoordinate middleChargeWidth = batteryInsideWidth/2;
     ctx->fillRect(KDRect(batteryInsideX, 0, middleChargeWidth, k_batteryHeight), Palette::Battery);
-    ctx->fillRect(KDRect(batteryInsideX+middleChargeWidth, 0, middleChargeWidth, k_batteryHeight), KDColor::blend(Palette::Toolbar, Palette::Battery, 128));
+    ctx->fillRect(KDRect(batteryInsideX+middleChargeWidth, 0, middleChargeWidth, k_batteryHeight), Palette::BatteryInCharge);
   } else {
     assert(m_chargeState == Ion::Battery::Charge::FULL);
     // Full but not plugged: Full battery

apps/calculation/Makefile

@@ -19,7 +19,6 @@ app_calculation_src = $(addprefix apps/calculation/,\
   additional_outputs/list_controller.cpp \
   additional_outputs/matrix_list_controller.cpp \
   additional_outputs/rational_list_controller.cpp \
-  additional_outputs/second_degree_list_controller.cpp \
   additional_outputs/trigonometry_graph_cell.cpp \
   additional_outputs/trigonometry_list_controller.cpp \
   additional_outputs/trigonometry_model.cpp \

apps/calculation/additional_outputs/second_degree_list_controller.cpp

@@ -1,312 +0,0 @@
-#include "../app.h"
-#include <apps/global_preferences.h>
-#include "../../shared/poincare_helpers.h"
-#include <poincare/layout_helper.h>
-#include <poincare/code_point_layout.h>
-#include <poincare/rational.h>
-#include <poincare/opposite.h>
-#include <poincare/addition.h>
-#include <poincare/parenthesis.h>
-#include <poincare/equal.h>
-#include <poincare/subtraction.h>
-#include <poincare/multiplication.h>
-#include <poincare/division.h>
-#include <poincare/square_root.h>
-#include <poincare/symbol.h>
-#include <poincare/power.h>
-#include "second_degree_list_controller.h"
-
-using namespace Poincare;
-using namespace Shared;
-
-namespace Calculation {
-    
-void SecondDegreeListController::setExpression(Poincare::Expression e) {
-  ExpressionsListController::setExpression(e);
-  assert(!m_expression.isUninitialized());
-
-  Expression polynomialCoefficients[Expression::k_maxNumberOfPolynomialCoefficients];
-  
-  Context * context = App::app()->localContext();
-  Preferences * preferences = Preferences::sharedPreferences();
-  Poincare::ExpressionNode::ReductionContext reductionContext = Poincare::ExpressionNode::ReductionContext(context, 
-          preferences->complexFormat(), preferences->angleUnit(), 
-          GlobalPreferences::sharedGlobalPreferences()->unitFormat(), 
-          ExpressionNode::ReductionTarget::SystemForApproximation, 
-          ExpressionNode::SymbolicComputation::ReplaceAllDefinedSymbolsWithDefinition, 
-          Poincare::ExpressionNode::UnitConversion::Default);
-
-  PoincareHelpers::Reduce(&m_expression, context, ExpressionNode::ReductionTarget::SystemForAnalysis);
-
-  int degree = m_expression.getPolynomialReducedCoefficients(
-          "x",
-          polynomialCoefficients,
-          context,
-          Expression::UpdatedComplexFormatWithExpressionInput(preferences->complexFormat(), m_expression, context),
-          preferences->angleUnit(),
-          GlobalPreferences::sharedGlobalPreferences()->unitFormat(),
-          ExpressionNode::SymbolicComputation::ReplaceAllDefinedSymbolsWithDefinition);
-
-  assert(degree == 2);
-
-  Expression a = polynomialCoefficients[2];
-  Expression b = polynomialCoefficients[1];
-  Expression c = polynomialCoefficients[0];
-  
-  Expression delta = Subtraction::Builder(Power::Builder(b.clone(), Rational::Builder(2)), Multiplication::Builder(Rational::Builder(4), a.clone(), c.clone()));
-  PoincareHelpers::Simplify(&delta, context, ExpressionNode::ReductionTarget::SystemForApproximation);
-
-  // Alpha is -b/2a, but because after we use -α, we immediately store -α=-(-b/2a)=b/2a.
-  Expression minusAlpha = Division::Builder(b.clone(), Multiplication::Builder(Rational::Builder(2), a.clone()));
-  PoincareHelpers::Reduce(&minusAlpha, context, ExpressionNode::ReductionTarget::SystemForApproximation);
-
-  // Same thing for β
-  Expression minusBeta = Division::Builder(delta.clone(), Multiplication::Builder(Rational::Builder(4), a.clone()));
-  PoincareHelpers::Reduce(&minusBeta, context, ExpressionNode::ReductionTarget::SystemForApproximation);
-
-  enum MultiplicationTypeForA {
-    Nothing,
-    Minus,
-    Parenthesis,
-    Normal
-  };
-
-  MultiplicationTypeForA multiplicationTypeForA;
-  
-  if (a.type() == ExpressionNode::Type::Rational && static_cast<const Rational &>(a).isOne()) {
-    multiplicationTypeForA = MultiplicationTypeForA::Nothing;
-  }
-  else if(a.type() == ExpressionNode::Type::Rational &&  static_cast<const Rational &>(a).isMinusOne()){
-    multiplicationTypeForA = MultiplicationTypeForA::Minus;
-  }
-  else if (a.type() == ExpressionNode::Type::Addition) {
-    multiplicationTypeForA = MultiplicationTypeForA::Parenthesis;
-  }
-  else {
-    multiplicationTypeForA = MultiplicationTypeForA::Normal;
-  }
-
-  PoincareHelpers::Simplify(&a, context, ExpressionNode::ReductionTarget::User);
-
-  /* 
-   * Because when can't apply reduce or simplify to keep the 
-   * canonized form we must beautify the expression manually 
-  */
-
-  Expression xMinusAlphaPowerTwo;
-  Expression alpha = getOppositeIfExists(minusAlpha, &reductionContext);
-
-  if (alpha.isUninitialized()) {
-    PoincareHelpers::Simplify(&minusAlpha, context, ExpressionNode::ReductionTarget::User);
-    xMinusAlphaPowerTwo = Power::Builder(Parenthesis::Builder(Addition::Builder(Symbol::Builder("x", strlen("x")), minusAlpha)), Rational::Builder(2));
-  }
-  else {
-    PoincareHelpers::Simplify(&alpha, context, ExpressionNode::ReductionTarget::User);
-    xMinusAlphaPowerTwo = Power::Builder(Parenthesis::Builder(Subtraction::Builder(Symbol::Builder("x", strlen("x")), alpha)), Rational::Builder(2));
-  }
-  
-  Expression xMinusAlphaPowerTwoWithFactor;
-
-  switch (multiplicationTypeForA)
-  {
-    case MultiplicationTypeForA::Nothing:
-      xMinusAlphaPowerTwoWithFactor = xMinusAlphaPowerTwo;
-      break;
-    case MultiplicationTypeForA::Minus:
-      xMinusAlphaPowerTwoWithFactor = Multiplication::Builder(a.clone(), xMinusAlphaPowerTwo);
-      break;
-    case MultiplicationTypeForA::Parenthesis:
-      xMinusAlphaPowerTwoWithFactor = Multiplication::Builder(Parenthesis::Builder(a.clone()), xMinusAlphaPowerTwo);
-      break;
-    case MultiplicationTypeForA::Normal:
-      xMinusAlphaPowerTwoWithFactor = Multiplication::Builder(a.clone(), xMinusAlphaPowerTwo);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-  
-  Expression canonized;
-  Expression beta = getOppositeIfExists(minusBeta, &reductionContext);
-  if (beta.isUninitialized()) {
-    PoincareHelpers::Simplify(&minusBeta, context, ExpressionNode::ReductionTarget::User);
-    canonized = Subtraction::Builder(xMinusAlphaPowerTwoWithFactor, minusBeta);
-  }
-  else {
-    PoincareHelpers::Simplify(&beta, context, ExpressionNode::ReductionTarget::User);
-    canonized = Addition::Builder(xMinusAlphaPowerTwoWithFactor, beta);
-  }
- 
-  Expression x0;
-  Expression x1;
-
-  if (delta.nullStatus(context) == ExpressionNode::NullStatus::Null) {
-    // x0 = x1 = -b/(2a)
-    x0 = Division::Builder(Opposite::Builder(b.clone()), Multiplication::Builder(Rational::Builder(2), a.clone()));
-    m_numberOfSolutions = 1;
-    PoincareHelpers::Simplify(&x0, context, ExpressionNode::ReductionTarget::SystemForApproximation);
-  } 
-  else {
-    // x0 = (-b-sqrt(delta))/(2a)
-    x0 = Division::Builder(Subtraction::Builder(Opposite::Builder(b.clone()), SquareRoot::Builder(delta.clone())), Multiplication::Builder(Rational::Builder(2), a.clone()));
-    // x1 = (-b+sqrt(delta))/(2a)
-    x1 = Division::Builder(Addition::Builder(Opposite::Builder(b.clone()), SquareRoot::Builder(delta.clone())), Multiplication::Builder(Rational::Builder(2), a.clone()));
-    m_numberOfSolutions = 2;
-    PoincareHelpers::Simplify(&x0, context, ExpressionNode::ReductionTarget::SystemForApproximation);
-    PoincareHelpers::Simplify(&x1, context, ExpressionNode::ReductionTarget::SystemForApproximation);
-    if (x0.type() == ExpressionNode::Type::Unreal) {
-      assert(x1.type() == ExpressionNode::Type::Unreal);
-      m_numberOfSolutions = 0;
-    }
-  }
-
-  Expression factorized;
-
-  if (m_numberOfSolutions == 2) {
-    Expression firstFactor;
-    Expression secondFactor;
-
-    Expression x0Opposite = getOppositeIfExists(x0, &reductionContext);
-    if (x0Opposite.isUninitialized()) {
-      PoincareHelpers::Simplify(&x0, context, ExpressionNode::ReductionTarget::User);
-      firstFactor = Subtraction::Builder(Symbol::Builder("x", strlen("x")), x0);
-    }
-    else {
-      PoincareHelpers::Simplify(&x0Opposite, context, ExpressionNode::ReductionTarget::User);
-      firstFactor = Addition::Builder(Symbol::Builder("x", strlen("x")), x0Opposite);
-    }
-    if (x0.type() == ExpressionNode::Type::Opposite) {
-      factorized = Parenthesis::Builder(Addition::Builder(Symbol::Builder("x", strlen("x")), x0.childAtIndex(0).clone()));
-    }
-
-    Expression x1Opposite = getOppositeIfExists(x1, &reductionContext);
-    if (x1Opposite.isUninitialized()) {
-      PoincareHelpers::Simplify(&x1, context, ExpressionNode::ReductionTarget::User);
-      secondFactor = Subtraction::Builder(Symbol::Builder("x", strlen("x")), x1);
-    }
-    else {
-      PoincareHelpers::Simplify(&x1Opposite, context, ExpressionNode::ReductionTarget::User);
-      secondFactor = Addition::Builder(Symbol::Builder("x", strlen("x")), x1Opposite);
-    }
-
-    Expression solutionProduct = Multiplication::Builder(Parenthesis::Builder(firstFactor), Parenthesis::Builder(secondFactor));
-    switch (multiplicationTypeForA)
-    {
-      case MultiplicationTypeForA::Nothing:
-        factorized = solutionProduct;
-        break;
-      case MultiplicationTypeForA::Minus:
-        factorized = Multiplication::Builder(a.clone(), solutionProduct);
-        break;
-      case MultiplicationTypeForA::Parenthesis:
-        factorized = Multiplication::Builder(Parenthesis::Builder(a.clone()), solutionProduct);
-        break;
-      case MultiplicationTypeForA::Normal:
-        factorized = Multiplication::Builder(a.clone(), solutionProduct);
-        break;
-      default:
-        assert(false);
-        break;
-    }
-  }
-  else if (m_numberOfSolutions == 1) {
-    Expression x0Opposite = getOppositeIfExists(x0, &reductionContext);
-    Expression factor;
-    if (x0Opposite.isUninitialized()) {
-      PoincareHelpers::Simplify(&x0, context, ExpressionNode::ReductionTarget::User);
-      factor = Subtraction::Builder(Symbol::Builder("x", strlen("x")), x0);
-    }
-    else {
-      PoincareHelpers::Simplify(&x0Opposite, context, ExpressionNode::ReductionTarget::User);
-      factor = Addition::Builder(Symbol::Builder("x", strlen("x")), x0Opposite);
-    }
-    Expression solutionProduct = Power::Builder(Parenthesis::Builder(factor), Rational::Builder(2));
-    switch (multiplicationTypeForA)
-    {
-      case MultiplicationTypeForA::Nothing:
-        factorized = solutionProduct;
-        break;
-      case MultiplicationTypeForA::Minus:
-        factorized = Multiplication::Builder(a.clone(), solutionProduct);
-        break;
-      case MultiplicationTypeForA::Parenthesis:
-        factorized = Multiplication::Builder(Parenthesis::Builder(a.clone()), solutionProduct);
-        break;
-      case MultiplicationTypeForA::Normal:
-        factorized = Multiplication::Builder(a.clone(), solutionProduct);
-        break;
-      default:
-        assert(false);
-        break;
-    }
-  }
-  
-  PoincareHelpers::Simplify(&delta, context, ExpressionNode::ReductionTarget::User);
-
-  m_layouts[0] = PoincareHelpers::CreateLayout(canonized);
-  if (m_numberOfSolutions > 0) {
-    m_layouts[1] = PoincareHelpers::CreateLayout(factorized);
-    m_layouts[2] = PoincareHelpers::CreateLayout(delta);
-    m_layouts[3] = PoincareHelpers::CreateLayout(x0);
-    if (m_numberOfSolutions > 1) {
-      m_layouts[4] = PoincareHelpers::CreateLayout(x1);
-    }
-  }
-  else {
-    m_layouts[1] = PoincareHelpers::CreateLayout(delta);
-  }
-}
-
-Expression SecondDegreeListController::getOppositeIfExists(Expression e, Poincare::ExpressionNode::ReductionContext * reductionContext) {
-  if (e.isNumber() && e.sign(reductionContext->context()) == ExpressionNode::Sign::Negative) {
-    Number n = static_cast<Number&>(e);
-    return std::move(n.setSign(ExpressionNode::Sign::Positive));
-  }
-  else if (e.type() == ExpressionNode::Type::Multiplication && e.numberOfChildren() > 0 && e.childAtIndex(0).isNumber() && e.childAtIndex(0).sign(reductionContext->context()) == ExpressionNode::Sign::Negative) {
-    Multiplication m = static_cast<Multiplication&>(e);
-    if (m.childAtIndex(0).type() == ExpressionNode::Type::Rational && static_cast<Rational&>(e).isMinusOne()) {
-      // The negative numeral factor is -1, we just remove it
-      m.removeChildAtIndexInPlace(0);
-    } else {
-      Expression firstChild = m.childAtIndex(0);
-      Number n = static_cast<Number&>(firstChild);
-      m.childAtIndex(0).setChildrenInPlace(n.setSign(ExpressionNode::Sign::Positive));
-    }
-    PoincareHelpers::Simplify(&m, reductionContext->context(), ExpressionNode::ReductionTarget::User);
-    return std::move(m);
-  }
-  return Expression();
-}
-
-I18n::Message SecondDegreeListController::messageAtIndex(int index) {
-  if (m_numberOfSolutions > 0) {
-    if (index == 0) {
-      return I18n::Message::CanonicalForm;
-    } 
-    if (index == 1) {
-      return I18n::Message::FactorizedForm;
-    }
-    if (index == 2) {
-      return I18n::Message::Discriminant;
-    }
-    if (index == 3) {
-      if (m_numberOfSolutions == 1) {
-        return I18n::Message::OnlyRoot;
-      }
-      else {
-        return I18n::Message::FirstRoot;
-      }
-    }
-    return I18n::Message::SecondRoot;
-  }
-  else {
-    switch (index) {
-      case 0:
-        return I18n::Message::CanonicalForm;
-      default:
-        return I18n::Message::Discriminant;
-    }
-  }
-}
-
-}

apps/calculation/additional_outputs/second_degree_list_controller.h

@@ -1,26 +0,0 @@
-#ifndef CALCULATION_ADDITIONAL_OUTPUTS_SECOND_DEGREE_CONTROLLER_H
-#define CALCULATION_ADDITIONAL_OUTPUTS_SECOND_DEGREE_CONTROLLER_H
-
-#include "expressions_list_controller.h"
-
-namespace Calculation {
-
-class SecondDegreeListController : public ExpressionsListController {
-public:
-  SecondDegreeListController(EditExpressionController * editExpressionController) :
-    ExpressionsListController(editExpressionController),
-    m_numberOfSolutions(0) {}
-
-  void setExpression(Poincare::Expression e) override;
-
-private:
-  Poincare::Expression getOppositeIfExists(Poincare::Expression e, Poincare::ExpressionNode::ReductionContext * reductionContext);
-  I18n::Message messageAtIndex(int index) override;
-  int m_numberOfSolutions;
-};
-
-}
-
-#endif
-
-

apps/calculation/app.cpp

@@ -72,7 +72,7 @@ bool App::isAcceptableExpression(const Poincare::Expression expression) {
       return false;
     }
   }
-  return !expression.isUninitialized();
+  return !(expression.isUninitialized() || expression.type() == ExpressionNode::Type::Equal);
 }
 
 void App::didBecomeActive(Window * window) {

apps/calculation/base.de.i18n

@@ -11,10 +11,4 @@ AdditionalDeterminant = "Determinante"
 AdditionalInverse = "Inverse"
 AdditionalRowEchelonForm = "Stufenform"
 AdditionalReducedRowEchelonForm = "Reduzierte Stufenform"
-AdditionalTrace = "Spur"
-CanonicalForm = "Kanonische Form"
-FactorizedForm = "Factorisierte Form"
-Discriminant = "Diskriminante"
-OnlyRoot = "Wurzel"
-FirstRoot = "Erste Wurzel"
-SecondRoot = "Zweite Wurzel"
+AdditionalTrace = "Spur"

apps/calculation/base.en.i18n

@@ -11,10 +11,4 @@ AdditionalDeterminant = "Determinant"
 AdditionalInverse = "Inverse"
 AdditionalRowEchelonForm = "Row echelon form"
 AdditionalReducedRowEchelonForm = "Reduced row echelon form"
-AdditionalTrace = "Trace"
-CanonicalForm = "Canonical form"
-FactorizedForm = "Factorized form"
-Discriminant = "Discriminant"
-OnlyRoot = "Root"
-FirstRoot = "First root"
-SecondRoot = "Second root"
+AdditionalTrace = "Trace"

apps/calculation/base.es.i18n

@@ -11,10 +11,4 @@ AdditionalDeterminant = "Determinante"
 AdditionalInverse = "Inversa"
 AdditionalRowEchelonForm = "Matriz escalonada"
 AdditionalReducedRowEchelonForm = "Matriz escalonada reducida"
-AdditionalTrace = "Traza"
-CanonicalForm = "Forma canónica"
-FactorizedForm = "Forma factorizada"
-Discriminant = "Discriminante"
-OnlyRoot = "Raíz"
-FirstRoot = "Primera raíz"
-SecondRoot = "Segunda raíz"
+AdditionalTrace = "Traza"

apps/calculation/base.fr.i18n

@@ -11,10 +11,4 @@ AdditionalDeterminant = "Déterminant"
 AdditionalInverse = "Inverse"
 AdditionalRowEchelonForm = "Forme échelonnée"
 AdditionalReducedRowEchelonForm = "Forme échelonnée réduite"
-AdditionalTrace = "Trace"
-CanonicalForm = "Forme canonique"
-FactorizedForm = "Forme factorisée"
-Discriminant = "Discriminant"
-OnlyRoot = "Racine"
-FirstRoot = "Première racine"
-SecondRoot = "Seconde racine"
+AdditionalTrace = "Trace"

apps/calculation/base.hu.i18n

@@ -3,18 +3,7 @@ CalculAppCapital = "SZÁMOLÁS"
 AdditionalResults = "További eredmények"
 DecimalBase = "Decimális"
 HexadecimalBase = "Hexadecimális"
-BinaryBase = "Bináris"
+BinaryBase = "Kétkomponensü"
 PrimeFactors = "Alapvetö tényezök"
 MixedFraction = "Vegyes frakció"
 EuclideanDivision = "Euklideszi osztás"
-AdditionalDeterminant = "Meghatározó"
-AdditionalInverse = "inverz"
-AdditionalRowEchelonForm = "Sor echelon forma"
-AdditionalReducedRowEchelonForm = "Csökkentett sorú Echelon forma"
-AdditionalTrace = "Nyomkövetés"
-CanonicalForm = "Kanonikus forma"
-FactorizedForm = "Factorizált forma"
-Discriminant = "Discriminant"
-OnlyRoot = "Gyökér"
-FirstRoot = "Első gyökér"
-SecondRoot = "Második gyökér"

apps/calculation/base.it.i18n

@@ -11,10 +11,4 @@ AdditionalDeterminant = "Determinante"
 AdditionalInverse = "Inversa"
 AdditionalRowEchelonForm = "Matrice a scalini"
 AdditionalReducedRowEchelonForm = "Matrice ridotta a scalini"
-AdditionalTrace = "Traccia"
-CanonicalForm = "Forma canonica"
-FactorizedForm = "Forma fattorizzata"
-Discriminant = "Discriminante"
-OnlyRoot = "Radice"
-FirstRoot = "Prima radice"
-SecondRoot = "Seconda radice"
+AdditionalTrace = "Traccia"

apps/calculation/base.nl.i18n

@@ -11,10 +11,4 @@ AdditionalDeterminant = "Determinant"
 AdditionalInverse = "Inverse"
 AdditionalRowEchelonForm = "Echelonvorm"
 AdditionalReducedRowEchelonForm = "Gereduceerde echelonvorm"
-AdditionalTrace = "Spoor"
-CanonicalForm = "Canonische vorm"
-FactorizedForm = "Factorized vorm"
-Discriminant = "Discriminant"
-OnlyRoot = "Wortel"
-FirstRoot = "Eerste wortel"
-SecondRoot = "Tweede wortel"
+AdditionalTrace = "Spoor"

apps/calculation/base.pt.i18n

@@ -11,10 +11,4 @@ AdditionalDeterminant = "Determinante"
 AdditionalInverse = "Matriz inversa"
 AdditionalRowEchelonForm = "Matriz escalonada"
 AdditionalReducedRowEchelonForm = "Matriz escalonada reduzida"
-AdditionalTrace = "Traço"
-CanonicalForm = "Forma canónica"
-FactorizedForm = "Factorized form"
-Discriminant = "Discriminante"
-OnlyRoot = "Raiz"
-FirstRoot = "Primeira raiz"
-SecondRoot = "Segunda raiz"
+AdditionalTrace = "Traço"

apps/calculation/calculation.cpp

@@ -8,7 +8,6 @@
 #include <poincare/undefined.h>
 #include <poincare/unit.h>
 #include <poincare/unreal.h>
-#include <poincare/symbol_abstract.h>
 #include <string.h>
 #include <cmath>
 #include <algorithm>
@@ -273,9 +272,6 @@ Calculation::AdditionalInformationType Calculation::additionalInformationType(Co
   if (o.type() == ExpressionNode::Type::Matrix) {
     return AdditionalInformationType::Matrix;
   }
-  if (o.polynomialDegree(context, "x") == 2) {
-    return AdditionalInformationType::SecondDegree;
-  }
   return AdditionalInformationType::None;
 }
 

apps/calculation/calculation.h

@@ -39,7 +39,6 @@ public:
     None = 0,
     Integer,
     Rational,
-    SecondDegree,
     Trigonometry,
     Unit,
     Matrix,

apps/calculation/expression_field.cpp

@@ -17,8 +17,7 @@ bool ExpressionField::handleEvent(Ion::Events::Event event) {
        event == Ion::Events::Power ||
        event == Ion::Events::Square ||
        event == Ion::Events::Division ||
-       event == Ion::Events::Sto ||
-       event == Ion::Events::EE)) {
+       event == Ion::Events::Sto)) {
     handleEventWithText(Poincare::Symbol::k_ans);
   }
   return(::ExpressionField::handleEvent(event));

apps/calculation/history_controller.cpp

@@ -16,7 +16,6 @@ HistoryController::HistoryController(EditExpressionController * editExpressionCo
   m_complexController(editExpressionController),
   m_integerController(editExpressionController),
   m_rationalController(editExpressionController),
-  m_secondDegreeController(editExpressionController),
   m_trigonometryController(editExpressionController),
   m_unitController(editExpressionController),
   m_matrixController(editExpressionController)
@@ -101,8 +100,6 @@ bool HistoryController::handleEvent(Ion::Events::Event event) {
       Expression e = calculationAtIndex(focusRow)->exactOutput();
       if (additionalInfoType == Calculation::AdditionalInformationType::Complex) {
         vc = &m_complexController;
-      } else if (additionalInfoType == Calculation::AdditionalInformationType::SecondDegree) {
-        vc = &m_secondDegreeController;
       } else if (additionalInfoType == Calculation::AdditionalInformationType::Trigonometry) {
         vc = &m_trigonometryController;
         // Find which of the input or output is the cosine/sine

apps/calculation/history_controller.h

@@ -8,7 +8,6 @@
 #include "additional_outputs/complex_list_controller.h"
 #include "additional_outputs/integer_list_controller.h"
 #include "additional_outputs/rational_list_controller.h"
-#include "additional_outputs/second_degree_list_controller.h"
 #include "additional_outputs/trigonometry_list_controller.h"
 #include "additional_outputs/unit_list_controller.h"
 #include "additional_outputs/matrix_list_controller.h"
@@ -48,7 +47,6 @@ private:
   ComplexListController m_complexController;
   IntegerListController m_integerController;
   RationalListController m_rationalController;
-  SecondDegreeListController m_secondDegreeController;
   TrigonometryListController m_trigonometryController;
   UnitListController m_unitController;
   MatrixListController m_matrixController;

apps/calculation/history_view_cell.cpp

@@ -81,7 +81,7 @@ void HistoryViewCell::reloadSubviewHighlight() {
   m_ellipsis.setHighlighted(false);
   if (isHighlighted()) {
     if (m_dataSource->selectedSubviewType() == HistoryViewCellDataSource::SubviewType::Input) {
-      m_inputView.setExpressionBackgroundColor(Palette::Select);
+      m_inputView.setExpressionBackgroundColor(Palette::ListCellBackgroundSelected);
     } else if (m_dataSource->selectedSubviewType() == HistoryViewCellDataSource::SubviewType::Output) {
       m_scrollableOutputView.evenOddCell()->setHighlighted(true);
     } else {

apps/calculation/test/calculation_store.cpp

@@ -114,10 +114,10 @@ QUIZ_CASE(calculation_display_exact_approximate) {
 
   assertCalculationIs("1/2", DisplayOutput::ExactAndApproximate, EqualSign::Equal, nullptr, nullptr, nullptr, &globalContext, &store);
   assertCalculationIs("1/3", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("1/0", DisplayOutput::ExactOnly, EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
-  assertCalculationIs("2x-x", DisplayOutput::ExactOnly, EqualSign::Unknown, "x", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("1/0", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("2x-x", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
   assertCalculationIs("[[1,2,3]]", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("[[1,x,3]]", DisplayOutput::ExactAndApproximate, EqualSign::Unknown, nullptr, "[[1,undef,3]]", "[[1,undef,3]]", &globalContext, &store);
+  assertCalculationIs("[[1,x,3]]", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "undef", "undef", &globalContext, &store);
   assertCalculationIs("28^7", DisplayOutput::ExactAndApproximate, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
   assertCalculationIs("3+√(2)→a", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, "√(2)+3", nullptr, nullptr, &globalContext, &store);
   Ion::Storage::sharedStorage()->recordNamed("a.exp").destroy();
@@ -130,9 +130,9 @@ QUIZ_CASE(calculation_display_exact_approximate) {
   assertCalculationIs("1+1+random()", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
   assertCalculationIs("1+1+round(1.343,2)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "3.34", "3.34", &globalContext, &store);
   assertCalculationIs("randint(2,2)+3", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "5", "5", "5", &globalContext, &store);
-  assertCalculationIs("confidence(0.5,2)+3", DisplayOutput::ExactOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("prediction(0.5,2)+3", DisplayOutput::ExactOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("prediction95(0.5,2)+3", DisplayOutput::ExactOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("confidence(0.5,2)+3", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("prediction(0.5,2)+3", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("prediction95(0.5,2)+3", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
 
 }
 
@@ -140,10 +140,10 @@ QUIZ_CASE(calculation_symbolic_computation) {
   Shared::GlobalContext globalContext;
   CalculationStore store(calculationBuffer,calculationBufferSize);
 
-  assertCalculationIs("x+x+1+3+√(π)", DisplayOutput::ExactOnly, EqualSign::Unknown, "2×x+√(π)+4", "undef", "undef", &globalContext, &store);
-  assertCalculationIs("f(x)", DisplayOutput::ExactOnly, EqualSign::Unknown, "f×x", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("x+x+1+3+√(π)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("f(x)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
   assertCalculationIs("1+x→f(x)", DisplayOutput::ExactOnly, EqualSign::Unknown, "x+1", nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("f(x)", DisplayOutput::ExactOnly, EqualSign::Unknown, "x+1", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("f(x)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
   assertCalculationIs("f(2)", DisplayOutput::ApproximateOnly, EqualSign::Equal, "3", "3", "3", &globalContext, &store);
   assertCalculationIs("2→x", DisplayOutput::ApproximateOnly, EqualSign::Equal, "2", nullptr, nullptr, &globalContext, &store);
   assertCalculationIs("f(x)", DisplayOutput::ApproximateOnly, EqualSign::Equal, "3", nullptr, nullptr, &globalContext, &store);

apps/code/Makefile

@@ -1,8 +1,6 @@
 apps += Code::App
 app_headers += apps/code/app.h
 
-SFLAGS += -DHAS_CODE
-
 app_code_src = $(addprefix apps/code/,\
   app.cpp \
   console_controller.cpp \
@@ -17,7 +15,6 @@ app_code_src = $(addprefix apps/code/,\
   sandbox_controller.cpp \
   script_name_cell.cpp \
   script_parameter_controller.cpp \
-  toolbox_ion_keys.cpp \
 )
 
 app_code_test_src = $(addprefix apps/code/,\
@@ -32,7 +29,6 @@ app_code_test_src = $(addprefix apps/code/,\
 
 tests_src += $(addprefix apps/code/test/,\
   variable_box_controller.cpp\
-  toolbox_ion_keys_dummy.cpp \
 )
 
 app_code_src += $(app_code_test_src)

apps/code/app.h

@@ -75,7 +75,7 @@ public:
 
   VariableBoxController * variableBoxController() { return &m_variableBoxController; }
 
-  static constexpr int k_pythonHeapSize = 67000;
+  static constexpr int k_pythonHeapSize = 100000;
 
 private:
   /* Python delegate:

apps/code/base.de.i18n

@@ -1,15 +1,15 @@
 AddScript = "Skript hinzufügen"
 AllowedCharactersaz09 = "Erlaubte Zeichen: a-z, 0-9, _"
 Autocomplete = "Autovervollständigung"
-AutoImportScript = "Automatischer Import in die Konsole"
-BuiltinsAndKeywords = "Native Funktionen & Schlüsselwörter"
+AutoImportScript = "Automatischer Import in Konsole"
+BuiltinsAndKeywords = "Native Funktionen und Schlüsselwörter"
 Console = "Interaktive Konsole"
 DeleteScript = "Skript löschen"
 DuplicateScript = "Skript duplizieren"
 ExecuteScript = "Skript ausführen"
 FunctionsAndVariables = "Funktionen und Variablen"
 ImportedModulesAndScripts = "Importierte Module und Skripte"
-NoWordAvailableHere = "Hier ist kein Wort verfügbar."
-ScriptInProgress = "Aktuelles Skript"
+NoWordAvailableHere = "Kein Wort ist hier verfübar."
+ScriptInProgress = "Aktuelle Skript"
 ScriptOptions = "Skriptoptionen"
-ScriptSize = "Skriptgröße"
+ScriptSize = "Script size"

apps/code/base.fr.i18n

@@ -12,4 +12,4 @@ ImportedModulesAndScripts = "Modules et scripts importés"
 NoWordAvailableHere = "Aucun mot disponible à cet endroit."
 ScriptInProgress = "Script en cours"
 ScriptOptions = "Options de script"
-ScriptSize = "Taille du script"
+ScriptSize = "Script size"

apps/code/base.hu.i18n

@@ -1,15 +1,15 @@
-AddScript = "Script hozzáadása"
+AddScript = "Script hozzadáadása"
 AllowedCharactersaz09 = "Engedélyezett karakterek: a-z, 0-9, _"
-Autocomplete = "Önkiegészítés"
+Autocomplete = "Autocomplete"
 AutoImportScript = "Script automata importálása"
-BuiltinsAndKeywords = "Beépített fonkciók és szókincs"
+BuiltinsAndKeywords = "Builtins and keywords"
 Console = "Konzol"
 DeleteScript = "Script törlése"
 DuplicateScript = "Script másolása"
 ExecuteScript = "Script indítása"
-FunctionsAndVariables = "Fonktiók és változók"
-ImportedModulesAndScripts = "Importált scriptek és modulok"
-NoWordAvailableHere = "Nincs rendelkezésre álló szó."
-ScriptInProgress = "Script müködésben"
+FunctionsAndVariables = "Függvények és változók"
+ImportedModulesAndScripts = "Imported modules and scripts"
+NoWordAvailableHere = "No word available here."
+ScriptInProgress = "Script in progress"
 ScriptOptions = "Script beállítások"
-ScriptSize = "Script mérete"
+ScriptSize = "Script size"

apps/code/catalog.de.i18n

@@ -3,208 +3,220 @@ PythonPercent = "Modulo"
 Python1J = "Imaginäres i"
 PythonLF = "Zeilenvorschub"
 PythonTab = "Tabulator"
-PythonAmpersand = "Bitweises und"
-PythonSymbolExp = "Bitweises exklusives oder"
-PythonVerticalBar = "Bitweises oder"
+PythonAmpersand = "Bitweise und"
+PythonSymbolExp = "Bitweise exklusiv oder"
+PythonVerticalBar = "Bitweise oder"
 PythonImag = "Imaginärteil von z"
 PythonReal = "Realteil von z"
 PythonSingleQuote = "Einfaches Anführungszeichen"
-PythonAbs = "Absoluter Wert/Absolute Größe"
-PythonAcos = "Bogenkosinus"
-PythonAcosh = "Bogenhyperbolischer Kosinus"
-PythonAppend = "x an das Ende der Liste anfügen"
-PythonArrow = "Pfeil von (x,y) nach (x+dx,y+dy)"
-PythonAsin = "Sinusbogen"
-PythonAsinh = "Kreisbogen hyperbolischer Sinus"
+PythonAbs = "Absolute/r Wert/Größe"
+PythonAcos = "Arkuskosinus"
+PythonAcosh = "Hyperbelkosinus"
+PythonAppend = "Hängt x an das Ende der Liste"
+PythonArrow = "Arrow from (x,y) to (x+dx,y+dy)"
+PythonAsin = "Arkussinus"
+PythonAsinh = "Hyperbelsinus"
 PythonAtan = "Arkustangens"
-PythonAtan2 = "Rückgabe atan(y/x)"
+PythonAtan2 = "Gib atan(y/x)"
 PythonAtanh = "Hyperbeltangens"
-PythonAxis = "Achsen auf (xmin,xmax,ymin,ymax)"
-PythonBar = "Balkendiagramm mit x-Werten"
-PythonBin = "Ganzzahl in Binärwert umwandeln"
-PythonCeil = "Aufrunden"
-PythonChoice = "Zufällige Zahl in der Liste"
-PythonClear = "Liste leeren"
+PythonAxis = "Set axes to (xmin,xmax,ymin,ymax)"
+PythonBar = "Draw a bar plot with x values"
+PythonBin = "Ganzzahl nach binär konvertieren"
+PythonCeil = "Aufrundung"
+PythonChoice = "Zufallszahl aus der Liste"
+PythonClear = "Leere die Liste"
 PythonCmathFunction = "cmath-Modul-Funktionspräfix"
-PythonColor = "Eine RGB-Farbe definieren"
-PythonColorBlack = "Farbe Schwarz"
-PythonColorBlue = "Farbe Blau"
-PythonColorBrown = "Farbe Braun"
-PythonColorGray = "Farbe Grau"
-PythonColorGreen = "Farbe Grün"
-PythonColorOrange = "Farbe Orange"
-PythonColorPink = "Farbe Rosa"
-PythonColorPurple = "Farbe Violett"
-PythonColorRed = "Farbe Rot"
-PythonColorWhite = "Farbe Weiß"
-PythonColorYellow = "Farbe Gelb"
-PythonComplex = "Gib a+ib zurück"
-PythonCopySign = "Gib x mit Vorzeichen von y zurück"
+PythonColor = "Definiere eine RGB-Farbe"
+PythonColorBlack = "Black color"
+PythonColorBlue = "Blue color"
+PythonColorBrown = "Brown color"
+PythonColorGray = "Gray color"
+PythonColorGreen = "Green color"
+PythonColorOrange = "Orange color"
+PythonColorPink = "Pink color"
+PythonColorPurple = "Purple color"
+PythonColorRed = "Red color"
+PythonColorWhite = "White color"
+PythonColorYellow = "Yellow color"
+PythonComplex = "a+ib zurückgeben"
+PythonCopySign = "x mit dem Vorzeichen von y"
 PythonCos = "Kosinus"
-PythonCosh = "Hyperbolischer Kosinus"
-PythonCount = "Zählt die Vorkommen von x"
-PythonDegrees = "x von Bogenmaß in Grad umrechnen"
+PythonCosh = "Hyperbolic cosine"
+PythonCount = "Zählt wie oft x vorkommt"
+PythonDegrees = "x von Radian zu Grad umwandeln"
 PythonDivMod = "Quotient und Rest"
-PythonDrawCircle = "Zeichne einen Kreis"
-PythonDrawLine = "Eine Linie zeichnen"
-PythonDrawString = "Text bei Pixel (x,y) darstellen"
+PythonDrawString = "Schreibt Text bei (x,y)"
 PythonErf = "Fehlerfunktion"
-PythonErfc = "Komplementäre Fehlerfunktion"
-PythonEval = "Rückgabe ausgewerteter Ausdruck"
+PythonErfc = "Complementary error function"
+PythonEval = "Return the evaluated expression"
 PythonExp = "Exponentialfunktion"
 PythonExpm1 = "Berechne exp(x)-1"
 PythonFabs = "Absoluter Wert"
-PythonFillRect = "Gefülltes Rechteck bei Pixel (x,y)"
-PythonFillCircle = "Füllt einen Kreis"
-PythonFillPolygon = "Füllt ein Polygon"
-PythonFloat = "x in einen Fließkommawert umwandeln"
-PythonFloor = "Abrunden"
+PythonFillRect = "Malt ein Rechteck bei Pixel (x,y)"
+PythonFloat = "Wandelt x zu float um"
+PythonFloor = "Floor"
 PythonFmod = "a modulo b"
-PythonFrExp = "Mantisse und Exponent von x: (m,e)"
-PythonGamma = "Gamma-Funktion"
-PythonGetKeys = "Gedrückte Tasten erhalten"
-PythonGetPalette = "Themenpalette erhalten"
-PythonGetPixel = "Farbe von Pixel (x,y) zurückgeben"
-PythonGetrandbits = "Ganzzahl mit k Zufallsbits"
-PythonGrid = "Sichtbarkeit des Gitters umschalten"
-PythonHex = "Ganzzahl in Hexadezimal umwandeln"
-PythonHist = "Zeichnet das Histogramm von x"
-PythonImportCmath = "cmath-Modul importieren"
-PythonImportIon = "Ion-Modul importieren"
-PythonImportKandinsky = "Kandinsky-Modul importieren"
-PythonImportRandom = "Random-Modul importieren"
-PythonImportMath = "Math-Modul importieren"
-PythonImportMatplotlibPyplot = "Matplotlib.pyplot-Modul importieren"
-PythonImportNumpy = "Ulab.numpy-Modul importieren"
-PythonImportScipy = "Ulab.scipy-Modul importieren"
-PythonImportOs = "OS-Modul importieren"
-PythonImportSys = "SYS-Modul importieren"
-PythonOsUname = "Informationen über das System holen"
-PythonOsGetlogin = "Benutzernamen holen"
+PythonFrExp = "Mantissa and exponent of x: (m,e)"
+PythonGamma = "Gamma function"
+PythonGetPixel = "Return pixel (x,y) color"
+PythonGetrandbits = "Integer with k random bits"
+PythonGrid = "Toggle the visibility of the grid"
+PythonHex = "Ganzzahl zu Hexadecimal"
+PythonHist = "Draw the histogram of x"
+PythonImportCmath = "cmath Modul importieren"
+PythonImportIon = "ion Modul importieren"
+PythonImportKandinsky = "kandinsky Modul importieren"
+PythonImportRandom = "random Modul importieren"
+PythonImportMath = "math Modul importieren"
+PythonImportMatplotlibPyplot = "Import matplotlib.pyplot module"
+PythonImportOs = "os Modul importieren"
+PythonOsUname = "Informieren Sie sich über das System"
 PythonOsRemove = "Datei namens Dateiname entfernen"
-PythonOsRename = "Datei umbenennen von Alt nach Neu"
+PythonOsRename = "Datei mit altem Namen in neuen Namen umbenennen"
 PythonOsListdir = "Dateien im Speicher auflisten"
-PythonSysExit = "Terminate current program"
-PythonSysPrintexception = "Print exception"
-PythonSysByteorder = "The byte order of the system"
-PythonSysImplementation = "Information about Python"
-PythonSysModules = "Dictionary of loaded modules"
-PythonSysVersion = "Python language version (string)"
-PythonSysVersioninfo = "Python language version (tuple)"
-PythonImportTime = "Time-Modul importieren"
-PythonImportTurtle = "Turtle-Modul importieren"
-PythonIndex = "Index des ersten x-Vorkommens"
-PythonInput = "Einen Wert abfragen"
-PythonInsert = "x an Index i in die Liste einfügen"
-PythonInt = "x in eine ganze Zahl umwandeln"
-PythonIonFunction = "Ion-Modul-Funktionspräfix"
-PythonIsFinite = "Prüfen, ob x endlich ist"
-PythonIsInfinite = "Prüfen, ob x unendlich ist"
-PythonIsNaN = "Prüfen, ob x keine Zahl ist"
-PythonIsKeyDown = "Wahr, wenn die Taste k gedrückt ist"
-PythonBattery = "Return battery voltage"
-PythonBatteryLevel = "Return battery level"
-PythonBatteryIscharging = "Return if battery is charging"
-PythonKandinskyFunction = "Kandinsky-Modul Funktionspräfix"
-PythonLdexp = "Liefert x*(2**i), Inverse von frexp"
-PythonLength = "Länge eines Objekts"
-PythonLgamma = "Log-Gamma-Funktion"
-PythonLog = "Logarithmus zur Basis a"
-PythonLog10 = "Logarithmus zur Basis 10"
-PythonLog2 = "Logarithmus zur Basis 2"
-PythonMathFunction = "Funktionspräfix des Math-Moduls"
-PythonMatplotlibPyplotFunction = "matplotlib.pyplot Modul-Präfix"
+PythonImportTime = "time Modul importieren"
+PythonImportTurtle = "turtle Modul importieren"
+PythonIndex = "Index, bei dem x zuerst vorkommt"
+PythonInput = "Eingabeaufforderung"
+PythonInsert = "x bei index i in der Liste einsetzen"
+PythonInt = "x zu Ganzzahl"
+PythonIonFunction = "ion module function prefix"
+PythonIsFinite = "Prüft ob x endlich ist"
+PythonIsInfinite = "Prüft ob x unendlich ist"
+PythonIsNaN = "Prüft ob x NaN ist"
+PythonIsKeyDown = "true wenn k gedrückt ist"
+PythonKandinskyFunction = "kandinsky module function prefix"
+PythonKeyLeft = "Linke Pfeiltaste"
+PythonKeyUp = "Pfeiltaste nach oben"
+PythonKeyDown = "Pfeiltaste nach unten"
+PythonKeyRight = "Rechte Pfeiltaste"
+PythonKeyOk = "OK Taste"
+PythonKeyBack = "ZURÜCK Taste"
+PythonKeyHome = "HOME Taste"
+PythonKeyOnOff = "AN/AUS Taste"
+PythonKeyShift = "SHIFT Taste"
+PythonKeyAlpha = "ALPHA Taste"
+PythonKeyXnt = "X,N,T Taste"
+PythonKeyVar = "VAR Taste"
+PythonKeyToolbox = "WERKZEUGBOX Taste"
+PythonKeyBackspace = "LÖSCHEN Taste"
+PythonKeyExp = "EXPONENTIAL Taste"
+PythonKeyLn = "NATURAL LOGARITHM Taste"
+PythonKeyLog = "DECIMAL LOGARITHM Taste"
+PythonKeyImaginary = "IMAGINÄRES I Taste"
+PythonKeyComma = "KOMMA Taste"
+PythonKeyPower = "HOCH Taste"
+PythonKeySine = "SINUS Taste"
+PythonKeyCosine = "COSINUS Taste"
+PythonKeyTangent = "TANGENZ Taste"
+PythonKeyPi = "PI Taste"
+PythonKeySqrt = "WURZEL Taste"
+PythonKeySquare = "QUADRAT Taste"
+PythonKeySeven = "7 Taste"
+PythonKeyEight = "8 Taste"
+PythonKeyNine = "9 Taste"
+PythonKeyLeftParenthesis = "LEFT PARENTHESIS key"
+PythonKeyRightParenthesis = "RIGHT PARENTHESIS key"
+PythonKeyFour = "4 Taste"
+PythonKeyFive = "5 Taste"
+PythonKeySix = "6 Taste"
+PythonKeyMultiplication = "MULTIPLIKATIONSTASTE"
+PythonKeyDivision = "DIVISIONSTASTE"
+PythonKeyOne = "1 Taste"
+PythonKeyTwo = "2 Taste"
+PythonKeyThree = "3 Taste"
+PythonKeyPlus = "PLUS Taste"
+PythonKeyMinus = "MINUS Taste"
+PythonKeyZero = "0 Taste"
+PythonKeyDot = "PUNKT Taste"
+PythonKeyEe = "10 HOCH X Taste"
+PythonKeyAns = "ANS Taste"
+PythonKeyExe = "EXE Taste"
+PythonLdexp = "Return x*(2**i), inverse of frexp"
+PythonLength = "Length of an object"
+PythonLgamma = "Log-gamma function"
+PythonLog = "Logarithm to base a"
+PythonLog10 = "Logarithm to base 10"
+PythonLog2 = "Logarithm to base 2"
+PythonMathFunction = "math module function prefix"
+PythonMatplotlibPyplotFunction = "matplotlib.pyplot module prefix"
 PythonMax = "Maximum"
 PythonMin = "Minimum"
-PythonModf = "Bruch- und Ganzzahl-Anteile von x"
-PythonMonotonic = "Wert einer monotonen Uhr"
-PythonNumpyFunction = "numpy Modul-Präfix"
-PythonNumpyFftFunction = "numpy.fft Modul-Präfix"
-PythonNumpyLinalgFunction = "numpy.linalg Modul-Präfix"
-PythonScipyFunction = "scipy Modul-Präfix"
-PythonScipyLinalgFunction = "scipy.linalg Modul-Präfix"
-PythonScipyOptimizeFunction = "scipy.optimize Modul-Präfix"
-PythonScipySignalFunction = "scipy.signal Modul-Präfix"
-PythonScipySpecialFunction = "scipy.special Modul-Präfix"
-PythonOct = "Ganzzahl in Oktal umwandeln"
-PythonPhase = "Phase von z"
-PythonPlot = "Plotten von y gegen x als Linien"
-PythonPolar = "z in Polarkoordinaten"
-PythonPop = "Letztes Element abnehmen"
-PythonPower = "x erhöht mit der Potenz y"
-PythonPrint = "Objekt drucken"
-PythonRadians = "x von Grad in Bogenmaß umrechnen"
-PythonRandint = "Zufällige Ganzzahl in [a,b]"
-PythonRandom = "Fließkommazahl in [0,1]"
-PythonRandomFunction = "Random-Modul Funktionspräfix"
-PythonRandrange = "Zufallszahl im Bereich(start,stop)"
-PythonRangeStartStop = "Liste von Start bis Stop-1"
-PythonRangeStop = "Liste von 0 bis Stop-1"
-PythonRect = "In kartesische Koordinaten"
-PythonRemove = "Entferne das erste Vorkommen von x"
-PythonReverse = "Kehrt die Elemente der Liste um"
-PythonRound = "Runden auf n Stellen"
-PythonScatter = "Streudiagramm von y gg. x zeichnen"
-PythonSeed = "Zufallszahlengenerator initiieren"
-PythonSetPixel = "Pixel (x,y) einfärben"
-PythonShow = "Figur anzeigen"
-PythonSin = "Sinus"
-PythonSinh = "Hyperbolischer Sinus"
-PythonSleep = "Ausführung aussetzen für t Sekunden"
-PythonLocalTime = "Zeit in Tupel umwandeln"
-PythonMktime = "Tupel in Zeit umwandeln"
-PythonTime = "Abrufen des aktuellen Zeitstempels"
-PythonSetLocaltime = "Zeit aus einem Tupel einstellen"
-PythonRTCmode = "Aktuellen RTC-Modus abrufen"
-PythonSetRTCmode = "RTC-Modus festlegen"
-PythonSort = "Die Liste sortieren"
-PythonSqrt = "Quadratwurzel"
-PythonSum = "Summe der Elemente einer Liste"
+PythonModf = "Fractional and integer parts of x"
+PythonMonotonic = "Value of a monotonic clock"
+PythonOct = "Convert integer to octal"
+PythonPhase = "Phase of z"
+PythonPlot = "Plot y versus x as lines"
+PythonPolar = "z in polar coordinates"
+PythonPop = "Remove and return the last item"
+PythonPower = "x raised to the power y"
+PythonPrint = "Print object"
+PythonRadians = "Convert x from degrees to radians"
+PythonRandint = "Random integer in [a,b]"
+PythonRandom = "Floating point number in [0,1["
+PythonRandomFunction = "random module function prefix"
+PythonRandrange = "Random number in range(start,stop)"
+PythonRangeStartStop = "List from start to stop-1"
+PythonRangeStop = "List from 0 to stop-1"
+PythonRect = "Convert to cartesian coordinates"
+PythonRemove = "Remove the first occurrence of x"
+PythonReverse = "Reverse the elements of the list"
+PythonRound = "Round to n digits"
+PythonScatter = "Draw a scatter plot of y versus x"
+PythonSeed = "Initialize random number generator"
+PythonSetPixel = "Color pixel (x,y)"
+PythonShow = "Display the figure"
+PythonSin = "Sine"
+PythonSinh = "Hyperbolic sine"
+PythonSleep = "Suspend the execution for t seconds"
+PythonSort = "Sort the list"
+PythonSqrt = "Wurzel"
+PythonSum = "Sum the items of a list"
 PythonTan = "Tangens"
-PythonTanh = "Hyperbolischer Tangens"
-PythonText = "Text an (x,y) Koordinaten anzeigen"
-PythonTimeFunction = "Time-Modul-Funktionspräfix"
-PythonTrunc = "x abgeschnitten auf eine ganze Zahl"
-PythonTurtleBackward = "Um x Pixel rückwärts bewegen"
-PythonTurtleCircle = "Kreis mit Radius r Pixel"
-PythonTurtleColor = "Setzt die Stiftfarbe"
-PythonTurtleColorMode = "Setzt Farbmodus auf 1.0 oder 255"
-PythonTurtleForward = "Um x Pixel vorwärts bewegen"
-PythonTurtleFunction = "Turtle-Modul-Funktionspräfix"
-PythonTurtleGoto = "Bewegen zu (x,y) Koordinaten"
-PythonTurtleHeading = "Liefert den aktuellen Kurs"
-PythonTurtleHideturtle = "Versteckt den Igel"
-PythonTurtleIsdown = "Wahr, wenn der Stift unten ist"
-PythonTurtleLeft = "Nach links um ein Grad drehen"
-PythonTurtlePendown = "Den Stift nach unten ziehen"
-PythonTurtlePensize = "Linienstärke auf x Pixel setzen"
-PythonTurtlePenup = "Den Stift nach oben ziehen"
-PythonTurtlePosition = "Aktuelle (x,y) Position zurückgeben"
-PythonTurtleReset = "Die Zeichnung zurücksetzen"
-PythonTurtleRight = "Um ein Grad nach rechts drehen"
-PythonTurtleSetheading = "Ausrichtung auf einen Grad setzen"
-PythonTurtleSetposition = "Den Igel auf Position setzen"
-PythonTurtleShowturtle = "Den Igel anzeigen"
-PythonTurtleSpeed = "Zeichengeschwindigkeit von 0 bis 10"
-PythonTurtleWrite = "Einen Text anzeigen"
-PythonUniform = "Fließkommazahl in [a,b]"
-PythonImportTime = "Time-Modul importieren"
-PythonTimePrefix = "Zeitmodul-Funktionspräfix"
-PythonTimeSleep = "Warte für n Sekunden"
-PythonMonotonic = "Monotone Zeit zurückgeben"
+PythonTanh = "Hyperbolic tangent"
+PythonText = "Display a text at (x,y) coordinates"
+PythonTimeFunction = "time module function prefix"
+PythonTrunc = "x truncated to an integer"
+PythonTurtleBackward = "Move backward by x pixels"
+PythonTurtleCircle = "Circle of radius r pixels"
+PythonTurtleColor = "Stiftfarbe setzen"
+PythonTurtleColorMode = "Set the color mode to 1.0 or 255"
+PythonTurtleForward = "Move forward by x pixels"
+PythonTurtleFunction = "turtle module function prefix"
+PythonTurtleGoto = "Move to (x,y) coordinates"
+PythonTurtleHeading = "Return the current heading"
+PythonTurtleHideturtle = "Hide the turtle"
+PythonTurtleIsdown = "Return True if the pen is down"
+PythonTurtleLeft = "Turn left by a degrees"
+PythonTurtlePendown = "Pull the pen down"
+PythonTurtlePensize = "Set the line thickness to x pixels"
+PythonTurtlePenup = "Pull the pen up"
+PythonTurtlePosition = "Return the current (x,y) location"
+PythonTurtleReset = "Reset the drawing"
+PythonTurtleRight = "Turn right by a degrees"
+PythonTurtleSetheading = "Set the orientation to a degrees"
+PythonTurtleSetposition = "Positionne la tortue"
+PythonTurtleShowturtle = "Show the turtle"
+PythonTurtleSpeed = "Drawing speed between 0 and 10"
+PythonTurtleWrite = "Display a text"
+PythonUniform = "Floating point number in [a,b]"
+PythonImportTime = "Import time module"
+PythonTimePrefix = "time module function prefix"
+PythonTimeSleep = "Wait for n second"
+PythonMonotonic = "Return monotonic time"
 PythonFileOpen = "Öffnet eine Datei"
-PythonFileSeekable = "Kann Datei durchsucht werden?"
-PythonFileSeek = "Bewegt den Cursor einer Datei"
-PythonFileTell = "Position des Cursors ermitteln"
+PythonFileSeekable = "Ist eine Datei durchsuchbar?"
+PythonFileSeek = "Dateicursor verschieben"
+PythonFileTell = "Cursorposition der Datei abrufen"
 PythonFileClose = "Schließt eine Datei"
-PythonFileClosed = "Wahr, wenn Datei geschlossen wurde"
-PythonFileRead = "Lesen bis zu einer Größe von Bytes"
-PythonFileWrite = "Schreibe b in Datei"
-PythonFileReadline = "Liest Zeile oder Anzahl Bytes"
+PythonFileClosed = "Wenn Datei geschlossen wurde"
+PythonFileRead = "Bis zu size Bytes lesen"
+PythonFileWrite = "Schreibe b in die Datei"
+PythonFileReadline = "Lies eine Zeile"
 PythonFileReadlines = "Liest eine Liste von Zeilen"
-PythonFileTruncate = "Verkleinert die Datei auf Größe"
+PythonFileTruncate = "Größe der Datei ändern"
 PythonFileWritelines = "Schreibt eine Liste von Zeilen"
-PythonFileName = "Enthält den Namen der Datei"
-PythonFileMode = "Enthält den Öffnungsmodus der Datei"
-PythonFileReadable = "Kann Datei gelesen werden?"
-PythonFileWritable = "Kann Datei geschrieben werden?"
+PythonFileName = "Dateiname"
+PythonFileMode = "Dateiöffnungsmodus"
+PythonFileReadable = "Ist die Datei lesbar?"
+PythonFileWritable = "Ist die Datei beschreibbar?"

apps/code/catalog.en.i18n

@@ -45,8 +45,6 @@ PythonCosh = "Hyperbolic cosine"
 PythonCount = "Count the occurrences of x"
 PythonDegrees = "Convert x from radians to degrees"
 PythonDivMod = "Quotient and remainder"
-PythonDrawCircle = "Draw a circle"
-PythonDrawLine = "Draw a line"
 PythonDrawString = "Display a text from pixel (x,y)"
 PythonErf = "Error function"
 PythonErfc = "Complementary error function"
@@ -54,16 +52,12 @@ PythonEval = "Return the evaluated expression"
 PythonExp = "Exponential function"
 PythonExpm1 = "Compute exp(x)-1"
 PythonFabs = "Absolute value"
-PythonFillCircle = "Fill a circle"
-PythonFillPolygon = "Fill a polygon"
 PythonFillRect = "Fill a rectangle at pixel (x,y)"
 PythonFloat = "Convert x to a float"
 PythonFloor = "Floor"
 PythonFmod = "a modulo b"
 PythonFrExp = "Mantissa and exponent of x: (m,e)"
 PythonGamma = "Gamma function"
-PythonGetKeys = "Get keys pressed"
-PythonGetPalette = "Get theme palette"
 PythonGetPixel = "Return pixel (x,y) color"
 PythonGetrandbits = "Integer with k random bits"
 PythonGrid = "Toggle the visibility of the grid"
@@ -75,8 +69,6 @@ PythonImportKandinsky = "Import kandinsky module"
 PythonImportRandom = "Import random module"
 PythonImportMath = "Import math module"
 PythonImportMatplotlibPyplot = "Import matplotlib.pyplot module"
-PythonImportNumpy = "Import ulab.numpy module"
-PythonImportScipy = "Import ulab.scipy module"
 PythonImportTime = "Import time module"
 PythonImportTurtle = "Import turtle module"
 PythonIndex = "Index of the first x occurrence"
@@ -87,11 +79,54 @@ PythonIonFunction = "ion module function prefix"
 PythonIsFinite = "Check if x is finite"
 PythonIsInfinite = "Check if x is infinity"
 PythonIsKeyDown = "Return True if the k key is down"
-PythonBattery = "Return battery voltage"
-PythonBatteryLevel = "Return battery level"
-PythonBatteryIscharging = "Return if battery is charging"
 PythonIsNaN = "Check if x is a NaN"
 PythonKandinskyFunction = "kandinsky module function prefix"
+PythonKeyLeft = "LEFT ARROW key"
+PythonKeyUp = "UP ARROW key"
+PythonKeyDown = "DOWN ARROW key"
+PythonKeyRight = "RIGHT ARROW key"
+PythonKeyOk = "OK key"
+PythonKeyBack = "BACK key"
+PythonKeyHome = "HOME key"
+PythonKeyOnOff = "ON/OFF key"
+PythonKeyShift = "SHIFT key"
+PythonKeyAlpha = "ALPHA key"
+PythonKeyXnt = "X,N,T key"
+PythonKeyVar = "VAR key"
+PythonKeyToolbox = "TOOLBOX key"
+PythonKeyBackspace = "BACKSPACE key"
+PythonKeyExp = "EXPONENTIAL key"
+PythonKeyLn = "NATURAL LOGARITHM key"
+PythonKeyLog = "DECIMAL LOGARITHM key"
+PythonKeyImaginary = "IMAGINARY I key"
+PythonKeyComma = "COMMA key"
+PythonKeyPower = "POWER key"
+PythonKeySine = "SINE key"
+PythonKeyCosine = "COSINE key"
+PythonKeyTangent = "TANGENT key"
+PythonKeyPi = "PI key"
+PythonKeySqrt = "SQUARE ROOT key"
+PythonKeySquare = "SQUARE key"
+PythonKeySeven = "7 key"
+PythonKeyEight = "8 key"
+PythonKeyNine = "9 key"
+PythonKeyLeftParenthesis = "LEFT PARENTHESIS key"
+PythonKeyRightParenthesis = "RIGHT PARENTHESIS key"
+PythonKeyFour = "4 key"
+PythonKeyFive = "5 key"
+PythonKeySix = "6 key"
+PythonKeyMultiplication = "MULTIPLICATION key"
+PythonKeyDivision = "DIVISION key"
+PythonKeyOne = "1 key"
+PythonKeyTwo = "2 key"
+PythonKeyThree = "3 key"
+PythonKeyPlus = "PLUS key"
+PythonKeyMinus = "MINUS key"
+PythonKeyZero = "0 key"
+PythonKeyDot = "DOT key"
+PythonKeyEe = "10 POWER X key"
+PythonKeyAns = "ANS key"
+PythonKeyExe = "EXE key"
 PythonLdexp = "Return x*(2**i), inverse of frexp"
 PythonLength = "Length of an object"
 PythonLgamma = "Log-gamma function"
@@ -104,14 +139,6 @@ PythonMax = "Maximum"
 PythonMin = "Minimum"
 PythonModf = "Fractional and integer parts of x"
 PythonMonotonic = "Value of a monotonic clock"
-PythonNumpyFunction = "numpy module prefix"
-PythonNumpyFftFunction = "numpy.fft module prefix"
-PythonNumpyLinalgFunction = "numpy.linalg module prefix"
-PythonScipyFunction = "scipy module prefix"
-PythonScipyLinalgFunction = "scipy.linalg module prefix"
-PythonScipyOptimizeFunction = "scipy.optimize module prefix"
-PythonScipySignalFunction = "scipy.signal module prefix"
-PythonScipySpecialFunction = "scipy.special module prefix"
 PythonOct = "Convert integer to octal"
 PythonPhase = "Phase of z"
 PythonPlot = "Plot y versus x as lines"
@@ -121,7 +148,7 @@ PythonPower = "x raised to the power y"
 PythonPrint = "Print object"
 PythonRadians = "Convert x from degrees to radians"
 PythonRandint = "Random integer in [a,b]"
-PythonRandom = "Floating point number in [0,1]"
+PythonRandom = "Floating point number in [0,1["
 PythonRandomFunction = "random module function prefix"
 PythonRandrange = "Random number in range(start,stop)"
 PythonRangeStartStop = "List from start to stop-1"
@@ -137,12 +164,6 @@ PythonShow = "Display the figure"
 PythonSin = "Sine"
 PythonSinh = "Hyperbolic sine"
 PythonSleep = "Suspend the execution for t seconds"
-PythonLocalTime = "Convert time into tuple"
-PythonMktime = "Convert tuple into time"
-PythonTime = "Get the current timestamp"
-PythonSetLocaltime = "Set time from a tuple"
-PythonRTCmode = "Get current RTC mode"
-PythonSetRTCmode = "Set RTC mode"
 PythonSort = "Sort the list"
 PythonSqrt = "Square root"
 PythonSum = "Sum the items of a list"
@@ -176,19 +197,10 @@ PythonTurtleWrite = "Display a text"
 PythonUniform = "Floating point number in [a,b]"
 PythonImportTime = "Import time module"
 PythonImportOs = "Import os module"
-PythonImportSys = "Import sys module"
 PythonOsUname = "Get infos about the system"
-PythonOsGetlogin = "Get username"
 PythonOsRemove = "Remove file named filename"
 PythonOsRename = "Rename file oldname to newname"
 PythonOsListdir = "List files in memory"
-PythonSysExit = "Terminate current program"
-PythonSysPrintexception = "Print exception"
-PythonSysByteorder = "The byte order of the system"
-PythonSysImplementation = "Information about Python"
-PythonSysModules = "Dictionary of loaded modules"
-PythonSysVersion = "Python language version (string)"
-PythonSysVersioninfo = "Python language version (tuple)"
 PythonTimePrefix = "time module function prefix"
 PythonTimeSleep = "Wait for n second"
 PythonMonotonic = "Return monotonic time"

apps/code/catalog.es.i18n

@@ -45,8 +45,6 @@ PythonCosh = "Hyperbolic cosine"
 PythonCount = "Count the occurrences of x"
 PythonDegrees = "Convert x from radians to degrees"
 PythonDivMod = "Quotient and remainder"
-PythonDrawCircle = "Draw a circle"
-PythonDrawLine = "Draw a line"
 PythonDrawString = "Display a text from pixel (x,y)"
 PythonErf = "Error function"
 PythonErfc = "Complementary error function"
@@ -54,16 +52,12 @@ PythonEval = "Return the evaluated expression"
 PythonExp = "Exponential function"
 PythonExpm1 = "Compute exp(x)-1"
 PythonFabs = "Absolute value"
-PythonFillCircle = "Fill a circle"
-PythonFillPolygon = "Fill a polygon"
 PythonFillRect = "Fill a rectangle at pixel (x,y)"
 PythonFloat = "Convert x to a float"
 PythonFloor = "Floor"
 PythonFmod = "a modulo b"
 PythonFrExp = "Mantissa and exponent of x: (m,e)"
 PythonGamma = "Gamma function"
-PythonGetKeys = "Obtener teclas presionadas"
-PythonGetPalette = "Get theme palette"
 PythonGetPixel = "Return pixel (x,y) color"
 PythonGetrandbits = "Integer with k random bits"
 PythonGrid = "Toggle the visibility of the grid"
@@ -75,8 +69,6 @@ PythonImportKandinsky = "Import kandinsky module"
 PythonImportRandom = "Import random module"
 PythonImportMath = "Import math module"
 PythonImportMatplotlibPyplot = "Import matplotlib.pyplot module"
-PythonImportNumpy = "Import ulab.numpy module"
-PythonImportScipy = "Import ulab.scipy module"
 PythonImportTime = "Import time module"
 PythonImportTurtle = "Import turtle module"
 PythonIndex = "Index of the first x occurrence"
@@ -87,11 +79,54 @@ PythonIonFunction = "ion module function prefix"
 PythonIsFinite = "Check if x is finite"
 PythonIsInfinite = "Check if x is infinity"
 PythonIsKeyDown = "Return True if the k key is down"
-PythonBattery = "Return battery voltage"
-PythonBatteryLevel = "Return battery level"
-PythonBatteryIscharging = "Return if battery is charging"
 PythonIsNaN = "Check if x is a NaN"
 PythonKandinskyFunction = "kandinsky module function prefix"
+PythonKeyLeft = "LEFT ARROW key"
+PythonKeyUp = "UP ARROW key"
+PythonKeyDown = "DOWN ARROW key"
+PythonKeyRight = "RIGHT ARROW key"
+PythonKeyOk = "OK key"
+PythonKeyBack = "BACK key"
+PythonKeyHome = "HOME key"
+PythonKeyOnOff = "ON/OFF key"
+PythonKeyShift = "SHIFT key"
+PythonKeyAlpha = "ALPHA key"
+PythonKeyXnt = "X,N,T key"
+PythonKeyVar = "VAR key"
+PythonKeyToolbox = "TOOLBOX key"
+PythonKeyBackspace = "BACKSPACE key"
+PythonKeyExp = "EXPONENTIAL key"
+PythonKeyLn = "NATURAL LOGARITHM key"
+PythonKeyLog = "DECIMAL LOGARITHM key"
+PythonKeyImaginary = "IMAGINARY I key"
+PythonKeyComma = "COMMA key"
+PythonKeyPower = "POWER key"
+PythonKeySine = "SINE key"
+PythonKeyCosine = "COSINE key"
+PythonKeyTangent = "TANGENT key"
+PythonKeyPi = "PI key"
+PythonKeySqrt = "SQUARE ROOT key"
+PythonKeySquare = "SQUARE key"
+PythonKeySeven = "7 key"
+PythonKeyEight = "8 key"
+PythonKeyNine = "9 key"
+PythonKeyLeftParenthesis = "LEFT PARENTHESIS key"
+PythonKeyRightParenthesis = "RIGHT PARENTHESIS key"
+PythonKeyFour = "4 key"
+PythonKeyFive = "5 key"
+PythonKeySix = "6 key"
+PythonKeyMultiplication = "MULTIPLICATION key"
+PythonKeyDivision = "DIVISION key"
+PythonKeyOne = "1 key"
+PythonKeyTwo = "2 key"
+PythonKeyThree = "3 key"
+PythonKeyPlus = "PLUS key"
+PythonKeyMinus = "MINUS key"
+PythonKeyZero = "0 key"
+PythonKeyDot = "DOT key"
+PythonKeyEe = "10 POWER X key"
+PythonKeyAns = "ANS key"
+PythonKeyExe = "EXE key"
 PythonLdexp = "Return x*(2**i), inverse of frexp"
 PythonLength = "Length of an object"
 PythonLgamma = "Log-gamma function"
@@ -104,14 +139,6 @@ PythonMax = "Maximum"
 PythonMin = "Minimum"
 PythonModf = "Fractional and integer parts of x"
 PythonMonotonic = "Value of a monotonic clock"
-PythonNumpyFunction = "numpy module prefix"
-PythonNumpyFftFunction = "numpy.fft module prefix"
-PythonNumpyLinalgFunction = "numpy.linalg module prefix"
-PythonScipyFunction = "scipy module prefix"
-PythonScipyLinalgFunction = "scipy.linalg module prefix"
-PythonScipyOptimizeFunction = "scipy.optimize module prefix"
-PythonScipySignalFunction = "scipy.signal module prefix"
-PythonScipySpecialFunction = "scipy.special module prefix"
 PythonOct = "Convert integer to octal"
 PythonPhase = "Phase of z"
 PythonPlot = "Plot y versus x as lines"
@@ -137,12 +164,6 @@ PythonShow = "Display the figure"
 PythonSin = "Sine"
 PythonSinh = "Hyperbolic sine"
 PythonSleep = "Suspend the execution for t seconds"
-PythonLocalTime = "Convertir el tiempo en tupla"
-PythonMktime = "Convertir tupla en tiempo"
-PythonTime = "Obtener la marca de tiempo actual"
-PythonSetLocaltime = "Establecer tiempo desde una tupla"
-PythonRTCmode = "Obtener el modo RTC actual"
-PythonSetRTCmode = "Establecer modo RTC"
 PythonSort = "Sort the list"
 PythonSqrt = "Square root"
 PythonSum = "Sum the items of a list"
@@ -176,19 +197,10 @@ PythonTurtleWrite = "Display a text"
 PythonUniform = "Floating point number in [a,b]"
 PythonImportTime = "Import time module"
 PythonImportOs = "Import os module"
-PythonImportSys = "Import sys module"
 PythonOsUname = " Información del sistema "
-PythonOsGetlogin = "Get username"
 PythonOsRemove = "Eliminar un archivo"
 PythonOsRename = "Renombrar archivo"
 PythonOsListdir = "Archivos de la lista"
-PythonSysExit = "Terminate current program"
-PythonSysPrintexception = "Print exception"
-PythonSysByteorder = "The byte order of the system"
-PythonSysImplementation = "Information about Python"
-PythonSysModules = "Dictionary of loaded modules"
-PythonSysVersion = "Python language version (string)"
-PythonSysVersioninfo = "Python language version (tuple)"
 PythonTimePrefix = "time module function prefix"
 PythonTimeSleep = "Esperar n segundos"
 PythonMonotonic = "Tiempo monótono de retorno"

apps/code/catalog.fr.i18n

@@ -45,8 +45,6 @@ PythonCosh = "Cosinus hyperbolique"
 PythonCount = "Compte les occurrences de x"
 PythonDegrees = "Conversion de radians en degrés"
 PythonDivMod = "Quotient et reste"
-PythonDrawCircle = "Trace un cercle"
-PythonDrawLine = "Trace une ligne"
 PythonDrawString = "Affiche un texte au pixel (x,y)"
 PythonErf = "Fonction d'erreur"
 PythonErfc = "Fonction d'erreur complémentaire"
@@ -54,16 +52,12 @@ PythonEval = "Evalue l'expression en argument "
 PythonExp = "Fonction exponentielle"
 PythonExpm1 = "Calcul de exp(x)-1"
 PythonFabs = "Valeur absolue"
-PythonFillCircle = "Remplit un cercle"
-PythonFillPolygon = "Remplit un polygone"
 PythonFillRect = "Remplit un rectangle"
 PythonFloat = "Conversion en flottant"
 PythonFloor = "Partie entière"
 PythonFmod = "a modulo b"
 PythonFrExp = "Mantisse et exposant de x : (m,e)"
 PythonGamma = "Fonction gamma"
-PythonGetKeys = "Obtenir les touches pressées"
-PythonGetPalette = "Obtient la palette du thème"
 PythonGetPixel = "Renvoie la couleur du pixel (x,y)"
 PythonGetrandbits = "Nombre aléatoire sur k bits"
 PythonGrid = "Affiche ou masque la grille"
@@ -75,8 +69,6 @@ PythonImportKandinsky = "Importation du module kandinsky"
 PythonImportRandom = "Importation du module random"
 PythonImportMath = "Importation du module math"
 PythonImportMatplotlibPyplot = "Importation de matplotlib.pyplot"
-PythonImportNumpy = "Importation de ulab.numpy"
-PythonImportScipy = "Importation de ulab.scipy"
 PythonImportTurtle = "Importation du module turtle"
 PythonImportTime = "Importation du module time"
 PythonIndex = "Indice première occurrence de x"
@@ -87,11 +79,54 @@ PythonIonFunction = "Préfixe fonction module ion"
 PythonIsFinite = "Teste si x est fini"
 PythonIsInfinite = "Teste si x est infini"
 PythonIsKeyDown = "Renvoie True si touche k enfoncée"
-PythonBattery = "Renvoie le voltage de la batterie"
-PythonBatteryLevel = "Renvoie le niveau de la batterie"
-PythonBatteryIscharging = "Chargement en cours"
 PythonIsNaN = "Teste si x est NaN"
 PythonKandinskyFunction = "Préfixe fonction module kandinsky"
+PythonKeyLeft = "Touche FLECHE GAUCHE"
+PythonKeyUp = "Touche FLECHE HAUT"
+PythonKeyDown = "Touche FLECHE BAS"
+PythonKeyRight = "Touche FLECHE DROITE"
+PythonKeyOk = "Touche OK"
+PythonKeyBack = "Touche RETOUR"
+PythonKeyHome = "Touche HOME"
+PythonKeyOnOff = "Touche ON/OFF"
+PythonKeyShift = "Touche SHIFT"
+PythonKeyAlpha = "Touche ALPHA"
+PythonKeyXnt = "Touche X,N,T"
+PythonKeyVar = "Touche VAR"
+PythonKeyToolbox = "Touche BOITE A OUTILS"
+PythonKeyBackspace = "Touche EFFACER"
+PythonKeyExp = "Touche EXPONENTIELLE"
+PythonKeyLn = "Touche LOGARITHME NEPERIEN"
+PythonKeyLog = "Touche LOGARITHME DECIMAL"
+PythonKeyImaginary = "Touche I IMAGINAIRE"
+PythonKeyComma = "Touche VIRGULE"
+PythonKeyPower = "Touche PUISSANCE"
+PythonKeySine = "Touche SINUS"
+PythonKeyCosine = "Touche COSINUS"
+PythonKeyTangent = "Touche TANGENTE"
+PythonKeyPi = "Touche PI"
+PythonKeySqrt = "Touche RACINE CARREE"
+PythonKeySquare = "Touche CARRE"
+PythonKeySeven = "Touche 7"
+PythonKeyEight = "Touche 8"
+PythonKeyNine = "Touche 9"
+PythonKeyLeftParenthesis = "Touche PARENTHESE GAUCHE"
+PythonKeyRightParenthesis = "Touche PARENTHESE DROITE"
+PythonKeyFour = "Touche 4"
+PythonKeyFive = "Touche 5"
+PythonKeySix = "Touche 6"
+PythonKeyMultiplication = "Touche MULTIPLICATION"
+PythonKeyDivision = "Touche DIVISION"
+PythonKeyOne = "Touche 1"
+PythonKeyTwo = "Touche 2"
+PythonKeyThree = "Touche 3"
+PythonKeyPlus = "Touche PLUS"
+PythonKeyMinus = "Touche MOINS"
+PythonKeyZero = "Touche 0"
+PythonKeyDot = "Touche POINT"
+PythonKeyEe = "Touche 10 PUISSANCE X"
+PythonKeyAns = "Touche ANS"
+PythonKeyExe = "Touche EXE"
 PythonLdexp = "Inverse de frexp : x*(2**i)"
 PythonLength = "Longueur d'un objet"
 PythonLgamma = "Logarithme de la fonction gamma"
@@ -104,14 +139,6 @@ PythonMax = "Maximum"
 PythonMin = "Minimum"
 PythonModf = "Parties fractionnaire et entière"
 PythonMonotonic = "Renvoie la valeur de l'horloge"
-PythonNumpyFunction = "Préfixe fonction du module numpy"
-PythonNumpyFftFunction = "Préfixe fonction du module numpy.fft"
-PythonNumpyLinalgFunction = "Préfixe fonction du module numpy.linalg"
-PythonScipyFunction = "Préfixe fonction du module scipy"
-PythonScipyLinalgFunction = "Préfixe fonction du module scipy.linalg"
-PythonScipyOptimizeFunction = "Préfixe fonction du module scipy.optimize"
-PythonScipySignalFunction = "Préfixe fonction du module scipy.signal"
-PythonScipySpecialFunction = "Préfixe fonction du module scipy.special"
 PythonOct = "Conversion en octal"
 PythonPhase = "Argument de z"
 PythonPlot = "Trace y en fonction de x"
@@ -137,12 +164,6 @@ PythonShow = "Affiche la figure"
 PythonSin = "Sinus"
 PythonSinh = "Sinus hyperbolique"
 PythonSleep = "Suspend l'exécution t secondes"
-PythonLocalTime = "Convertir le temps en tuple"
-PythonMktime = "Convertir le tuple en temps"
-PythonTime = "Obtenir l'horodatage actuel"
-PythonSetLocaltime = "Définir l'heure à partir d'un tuple"
-PythonRTCmode = "Obtenir le mode RTC actuel"
-PythonSetRTCmode = "Définir le mode RTC"
 PythonSort = "Trie la liste"
 PythonSqrt = "Racine carrée"
 PythonSum = "Somme des éléments de la liste"
@@ -176,34 +197,25 @@ PythonTurtleWrite = "Affiche un texte"
 PythonUniform = "Nombre décimal dans [a,b]"
 PythonImportTime = "Importation du module temps"
 PythonImportOs = "Importation du module os"
-PythonImportSys = "Importation du module sys"
 PythonOsUname = "Donne des infos sur le système"
-PythonOsGetlogin = "Donne le nom d'utilisateur"
 PythonOsRemove = "Supprime le fichier nommé filename"
 PythonOsRename = "Renomme oldname en newname"
 PythonOsListdir = "Liste les fichiers"
-PythonSysExit = "Termine le programme"
-PythonSysPrintexception = "Imprime une exception"
-PythonSysByteorder = "L'ordre des octets du système"
-PythonSysImplementation = "Information sur Python"
-PythonSysModules = "Dictionnaire des modules chargés"
-PythonSysVersion = "Version du langage Python (string)"
-PythonSysVersioninfo = "Version du langage Python (tuple)"
 PythonTimePrefix = "Préfixe fonction du module temps"
 PythonTimeSleep = "Attendre n secondes"
-PythonMonotonic = "Retourne le temps monotone"
+PythonMonotonic = "Retourne le temps monotonic"
 PythonFileOpen = "Ouvre un fichier"
 PythonFileSeekable = "Indique si seek peut être utilisé"
 PythonFileSeek = "Déplace le curseur interne"
 PythonFileTell = "Donne la posititon du curseur"
 PythonFileClose = "Ferme un fichier"
 PythonFileClosed = "True si le fichier a été fermé"
-PythonFileRead = "Lit jusqu'à size bytes"
-PythonFileWrite = "Écrit b dans le fichier"
-PythonFileReadline = "Lit une ligne ou jusqu'à size bytes"
-PythonFileReadlines = "Lit une liste de lignes"
+PythonFileRead = "Lis jusqu'à size bytes"
+PythonFileWrite = "Écris b dans le fichier"
+PythonFileReadline = "Lis une ligne ou jusqu'à size bytes"
+PythonFileReadlines = "Lis une liste de lignes"
 PythonFileTruncate = "Redimensionne le fichier"
-PythonFileWritelines = "Écrit une liste de lignes"
+PythonFileWritelines = "Écris une liste de lignes"
 PythonFileName = "Nom du fichier"
 PythonFileMode = "Mode d'ouverture du fichier"
 PythonFileReadable = "Indique si read peut être utilisé"

apps/code/catalog.hu.i18n

@@ -1,210 +1,222 @@
 PythonPound = "Megjegyzés"
 PythonPercent = "Modulo"
 Python1J = "Képzeletbeli i"
-PythonLF = "Enter"
+PythonLF = "Line feed"
 PythonTab = "Táblázat"
-PythonAmpersand = "Logikus és"
-PythonSymbolExp = "logikus exkluzív vagy pedig"
-PythonVerticalBar = "logikus vagy pedig"
+PythonAmpersand = "Bitwise és"
+PythonSymbolExp = "Bitwise exkluzív vagy"
+PythonVerticalBar = "Bitwise vagy"
 PythonImag = "z képzeletbeli része"
 PythonReal = "z valódi része"
-PythonSingleQuote = "apostróf"
-PythonAbs = "Abszolút érték/nagyság"
-PythonAcos = "Ív (arc) koszinusz"
-PythonAcosh = "Hiperbolikus arc koszinusz"
-PythonAppend = "Lista végére hozzáadni x-et"
-PythonArrow = "(x,y) nyíla (x+dx,y+dy) nyílához"
-PythonAsin = "Ív (arc) szinusz"
-PythonAsinh = "Hiperbolikus ív (arc) szinusz"
-PythonAtan = "Ív (arc) érintö (tan)"
-PythonAtan2 = "atan(y/x) sámolása"
-PythonAtanh = "Hiperbolikus ív (arc) érintö (atan)"
-PythonAxis = "Tengelyeket (xmin,xmax,ymin,ymax)-ra állitani"
-PythonBar = "Az x lista oszlopdiagramja"
+PythonSingleQuote = "Egyetlen idézet"
+PythonAbs = "Abszolút érték / nagyság"
+PythonAcos = "Arc koszinusz"
+PythonAcosh = "Íves hiperbolikus koszinusz"
+PythonAppend = "x hozzáadása a lista végéhez"
+PythonArrow = "Arrow from (x,y) to (x+dx,y+dy)"
+PythonAsin = "Arc szinusz"
+PythonAsinh = "Íves hiperbolikus szinusz"
+PythonAtan = "Arc érintö"
+PythonAtan2 = "Visszatérés atan (y / x)"
+PythonAtanh = "Arc hiperbolikus érintö"
+PythonAxis = "Set axes to (xmin,xmax,ymin,ymax)"
+PythonBar = "Draw a bar plot with x values"
 PythonBin = "Egész szám konvertálása binárisra"
 PythonCeil = "Mennyezet"
 PythonChoice = "Véletlenszerü szám a listában"
 PythonClear = "A lista ürítése"
 PythonCmathFunction = "cmath modul funkció elötag"
-PythonColor = "Rgb (pzk) szín allítása"
+PythonColor = "Rgb szín meghatározása"
 PythonColorBlack = "Fekete szín"
 PythonColorBlue = "Kék szín"
 PythonColorBrown = "Barna szín"
 PythonColorGreen = "Zöld szín"
-PythonColorGray = "Szürke szín"
+PythonColorGrey = "Szürke szín"
 PythonColorOrange = "Narancssárga szín"
 PythonColorPink = "Rózsaszín szín"
 PythonColorPurple = "Lila szín"
 PythonColorRed = "Piros szín"
-PythonColorWhite = "Fehér szín"
+PythonColorWhite = "White color"
 PythonColorYellow = "Sárga szín"
 PythonComplex = "A + ib visszaadása"
-PythonCopySign = "X visszaadása y jelével"
+PythonCopySign = "Visszatérés x-val y jelével"
 PythonCos = "Koszinusz"
 PythonCosh = "Hiperbolikus koszinusz"
 PythonCount = "Számolja az x elöfordulását"
-PythonDegrees = "x konvertálása radiánokrol fokokra"
+PythonDegrees = "x konvertálása x-röl radiánokra fokokra"
 PythonDivMod = "Hányados és maradék"
-PythonDrawCircle = "Rajzolj egy kört"
-PythonDrawLine = "Húzzon egy vonalat "
-PythonDrawString = "Szöveg megjelenítése (x, y)-en"
+PythonDrawString = "Szöveg megjelenítése pixelböl (x, y)"
 PythonErf = "Hiba funkció"
-PythonErfc = "Kiegészítö hiba funkció"
+PythonErfc = "Kiegészítö hibafunkció"
 PythonEval = "Visszaadja az értékelt kifejezést"
 PythonExp = "Exponenciális függvény"
-PythonExpm1 = "exp(x)-1 sámitása"
+PythonExpm1 = "Számítsuk ki az exp (x) -1-et"
 PythonFabs = "Abszolút érték"
-PythonFillRect = "Téglalap töltése"
-PythonFillCircle = "Kitölti a kört"
-PythonFillPolygon = "Kitölti a poligont"
-PythonFloat = "Konvertálása tizedes számra"
-PythonFloor = "Egész része"
+PythonFillRect = "Töltsön meg egy téglalapot pixelnél (x, y)"
+PythonFloat = "x konvertálása float-ra"
+PythonFloor = "Emelet"
 PythonFmod = "a modulo b"
-PythonFrExp = "X mantissája és kiállítója"
+PythonFrExp = "Mantissa és az x exponense"
 PythonGamma = "Gamma funkció"
-PythonGetKeys = "Billentyűk lenyomva"
-PythonGetPalette = "Téma paletta beszerzése"
-PythonGetPixel = "Visszatéríti (x,y) színét"
-PythonGetrandbits = "Váletlenszám visszatérítése k biten"
-PythonGrid = "Rács megjelenítése/elrejtése"
-PythonHex = "Decimális szám konvertálása hexadecimális számra"
-PythonHist = "x hisztográmiája"
+PythonGetPixel = "Visszatérési pixel (x, y) szín"
+PythonGetrandbits = "Egész szám k véletlen bittel"
+PythonGrid = "Toggle the visibility of the grid"
+PythonHex = "Egész szám konvertálása hexadecimálisra"
+PythonHist = "Draw the histogram of x"
 PythonImportCmath = "cmath modul importálása"
 PythonImportIon = "Ion modul importálása"
 PythonImportKandinsky = "Kandinsky modul importálása"
 PythonImportRandom = "Véletlenszerü modul importálása"
-PythonImportMath = "math modul importálása"
-PythonImportMatplotlibPyplot = "matplotlib.pyplot modul importálása"
-PythonImportNumpy = "ulab.numpy modul importálása"
-PythonImportScipy = "ulab.scipy modul importálása"
-PythonImportTurtle = "turtle modul importálása"
-PythonImportTime = "time modul importálása"
+PythonImportMath = "Import matematikai modul"
+PythonImportMatplotlibPyplot = "Import matplotlib.pyplot module"
+PythonImportTime = "Idömodul importálása"
+PythonImportOs = "Os modul importálása"
+PythonOsUname = "Információ a rendszerről"
+PythonOsRemove = "Fájl eltávolítása"
+PythonOsRename = "Fájl átnevezése"
+PythonOsListdir = "Fájlok listázása"
+PythonImportTurtle = "Import teknös modul"
 PythonIndex = "Az elsö x esemény indexe"
-PythonInput = "Irjon egy értéket (számot)"
-PythonInsert = "x-et i. pozícióra helyezze a listában"
-PythonInt = "egész számra konvertálás"
+PythonInput = "Érték kérése"
+PythonInsert = "Helyezzen x-t az i indexbe a listában"
+PythonInt = "x konvertálása egész számra"
 PythonIonFunction = "ion modul funkció elötag"
-PythonIsFinite = "x véges-e"
-PythonIsInfinite = "x végtelen-e"
-PythonIsKeyDown = "True-t válaszol ha a k gomb le van nyomva"
-PythonBattery = "Return battery voltage"
-PythonBatteryLevel = "Return battery level"
-PythonBatteryIscharging = "Return if battery is charging"
-PythonIsNaN = "Ellenörizze hogy x nem NaN"
-PythonKandinskyFunction = "kandinsky modul funkció elötag"
-PythonLdexp = "frexp ellentéte : x*(2**i)"
-PythonLength = "Egy targy hossza"
-PythonLgamma = "Gamma funkció logaritmusa"
-PythonLog = "a alapú logaritmus"
-PythonLog10 = "Decimális logaritmus"
-PythonLog2 = "Bináris logaritmus"
-PythonMathFunction = "math modul funkció elötag"
-PythonMatplotlibPyplotFunction = "matplotlib.pyplot elötag"
+PythonIsFinite = "Ellenörizze, hogy x véges-e"
+PythonIsInfinite = "Ellenörizze, hogy x végtelen-e"
+PythonIsKeyDown = "True true, ha a k gomb le van nyomva"
+PythonIsNaN = "Ellenörizze, hogy x nem NaN"
+PythonKandinskyFunction = "kandinsky modul function prefix"
+PythonKeyLeft = "Balra nyíl gomb"
+PythonKeyUp = "FEL NYÍL gomb"
+PythonKeyDown = "LE nyíl gomb"
+PythonKeyRight = "JOBB NYÍL gomb"
+PythonKeyOk = "OK gomb"
+PythonKeyBack = "VISSZA kulcs"
+PythonKeyHome = "HOME kulcs"
+PythonKeyOnOff = "BE / KI gomb"
+PythonKeyShift = "SHIFT kulcs"
+PythonKeyAlpha = "ALPHA kulcs"
+PythonKeyXnt = "X, N, T kulcs"
+PythonKeyVar = "VAR kulcs"
+PythonKeyToolbox = "TOOLBOX kulcs"
+PythonKeyBackspace = "BACKSPACE kulcs"
+PythonKeyExp = "EXPONENTIAL kulcs"
+PythonKeyLn = "NATURAL LOGARITHM kulcs"
+PythonKeyLog = "DECIMAL LOGARITHM kulcs"
+PythonKeyImaginary = "IMAGINÁRIS I kulcs"
+PythonKeyComma = "COMMA kulcs"
+PythonKeyPower = "POWER kulcs"
+PythonKeySine = "SINE kulcs"
+PythonKeyCosine = "KOSZIN kulcs"
+PythonKeyTangent = "TANGENT kulcs"
+PythonKeyPi = "PI kulcs"
+PythonKeySqrt = "SQUARE ROOT kulcs"
+PythonKeySquare = "SQUARE kulcs"
+PythonKeySeven = "7 kulcs"
+PythonKeyEight = "8 kulcs"
+PythonKeyNine = "9 kulcs"
+PythonKeyLeftParenthesis = "Bal oldali PARENTHESIS kulcs"
+PythonKeyRightParenthesis = "JOGOS SZÜLETÉS kulcs"
+PythonKeyFour = "4 kulcs"
+PythonKeyFive = "5 kulcs"
+PythonKeySix = "6 kulcs"
+PythonKeyMultiplication = "TÖBB MüKÖDÉS kulcs"
+PythonKeyDivision = "DIVISION kulcs"
+PythonKeyOne = "1 kulcs"
+PythonKeyTwo = "2 kulcs"
+PythonKeyThree = "3 kulcs"
+PythonKeyPlus = "PLUS kulcs"
+PythonKeyMinus = "MINUS kulcs"
+PythonKeyZero = "0 kulcs"
+PythonKeyDot = "DOT kulcs"
+PythonKeyEe = "10 POWER X kulcs"
+PythonKeyAns = "ANS kulcs"
+PythonKeyExe = "EXE kulcs"
+PythonLdexp = "Visszatérés x * (2 ** i), inverz a frexp értékhez"
+PythonLength = "Objektum hossza"
+PythonLgamma = "Log-gamma funkció"
+PythonLog = "Logaritmus az alap"
+PythonLog10 = "Logaritmus az alaphoz 10"
+PythonLog2 = "Logaritmus az alaphoz 2"
+PythonMathFunction = "matematikai modul funkció elötag"
+PythonMatplotlibPyplotFunction = "matplotlib.pyplot module prefix"
 PythonMax = "Maximum"
 PythonMin = "Minimum"
-PythonModf = "x-nek tört és egész részei"
-PythonMonotonic = "Az óra értékét adja vissza"
-PythonNumpyFunction = "numpy elötag"
-PythonNumpyFftFunction = "numpy.fft elötag"
-PythonNumpyLinalgFunction = "numpy.linalg elötag"
-PythonScipyFunction = "scipy elötag"
-PythonScipyLinalgFunction = "scipy.linalg elötag"
-PythonScipyOptimizeFunction = "scipy.optimize elötag"
-PythonScipySignalFunction = "scipy.signal elötag"
-PythonScipySpecialFunction = "scipy.special elötag"
-PythonOct = "Decimális szám konvertálása octális számra"
-PythonPhase = "z fázisa"
-PythonPlot = "y-t jelöli x függvényében"
-PythonPolar = "Verctorizálni"
-PythonPop = "Az utolsó elemet el törölni"
-PythonPower = "x y. kitevö"
-PythonPrint = "Ki irni a elemeket"
-PythonRadians = "Fokról radiánra konvertálni"
-PythonRandint = "Véletlen egész szám [a;b] -ban"
-PythonRandom = "Decimális szám [0;1] -ban"
-PythonRandomFunction = "random modul funkció elötag"
-PythonRandrange = "Véletlen szám range(start,stop)-ban"
-PythonRangeStartStop = "start-tol stop-ig listája"
-PythonRangeStop = "0 tol stop-ig lista"
-PythonRect = "Algebrai számra konvertálni"
-PythonRemove = "Elsö x elöfordulását törolni"
-PythonReverse = "A lista elemeit megfordítani (másik irány)"
-PythonRound = "N számjegyre kerekítni"
-PythonScatter = "(x,y) halmaza"
-PythonSeed = "Inicializálni a véletlenszám-választót"
-PythonSetPixel = "Az (x,y) pixel-t ki szinezni"
-PythonShow = "Mutassa az ábrát"
-PythonSin = "Szinusz"
+PythonModf = "Az x tört és egész részei"
+PythonMonotonic = "A monoton óra értéke"
+PythonOct = "Egész szám konvertálása oktális értékre"
+PythonPhase = "z fázis"
+PythonPlot = "Plot y versus x as lines"
+PythonPolar = "z poláris koordinátákban"
+PythonPop = "Az utolsó elem eltávolítása és visszaküldése"
+PythonPower = "x emelve az y teljesítményre"
+PythonPrint = "Objektum nyomtatása"
+PythonRadians = "x konvertálása x fokról radiánra"
+PythonRandint = "Véletlen egész szám [a, b] -ben"
+PythonRandom = "Lebegöpontos szám [0,1-ben ["
+PythonRandomFunction = "véletlenszerü modul funkció elötag"
+PythonRandrange = "Véletlen szám a tartományban (start, stop)"
+PythonRangeStartStop = "Lista az elejétöl a stop-1-ig"
+PythonRangeStop = "Lista 0-tól stop-1-ig"
+PythonRect = "z derékszögü koordinátákban"
+PythonRemove = "Távolítsa el az x elsö elöfordulását"
+PythonReverse = "A lista elemeinek megfordítása"
+PythonRound = "N számjegyre kerekítve"
+PythonScatter = "Draw a scatter plot of y versus x"
+PythonSeed = "Inicializálja a véletlenszám-generátort"
+PythonSetPixel = "Színes pixel (x, y)"
+PythonShow = "Display the figure"
+PythonSin = "Sine"
 PythonSinh = "Hiperbolikus szinusz"
-PythonSleep = "t másodpercre meg állitani a programmot"
-PythonLocalTime = "Idő konvertálása csomóvá"
-PythonMktime = "A tuple konvertálása az időben"
-PythonTime = "Az aktuális időbélyeg letöltése"
-PythonSetLocaltime = "Idő beállítása egy csomóból"
-PythonRTCmode = "Aktuális RTC mód"
-PythonSetRTCmode = "RTC mód beállítása"
-PythonSort = "A listát rendezni"
+PythonSleep = "A végrehajtás felfüggesztése t másodpercre"
+PythonSort = "A lista rendezése"
 PythonSqrt = "Négyzetgyök"
-PythonSum = "Összeadni a lista elemeit"
-PythonTan = "Érintö (tan)"
-PythonTanh = "Hiperbolikus érintö (tan)"
-PythonText = "(x,y) nél egy szöveget irni"
-PythonTimeFunction = "time funkció elötag"
-PythonTrunc = "Egész csonka (?)"
-PythonTurtleBackward = "x pixelt hátra"
-PythonTurtleCircle = "r pixel sugarú kört rajzolni"
-PythonTurtleColor = "Toll szinét beállitani"
-PythonTurtleColorMode = "Szin módot 1.0-ra vagy 255-ra állitani"
-PythonTurtleForward = "x pixelt elölre"
-PythonTurtleFunction = "turtle modul funkció elötag"
-PythonTurtleGoto = "Menjen a (x,y) koordinátákra"
-PythonTurtleHeading = "Visszaadja az aktuális irányt"
+PythonSum = "Összegzi a lista elemeit"
+PythonTan = "Érintö"
+PythonTanh = "Hiperbolikus érintö"
+PythonText = "Display a text at (x,y) coordinates"
+PythonTimeFunction = "idömodul funkció elötag"
+PythonTrunc = "x egészre csonkítva"
+PythonTurtleBackward = "Visszalépés x pixelrel"
+PythonTurtleCircle = "r pixel sugarú kör"
+PythonTurtleColor = "Állítsa be az toll színét"
+PythonTurtleColorMode = "Set the color mode to 1.0 or 255"
+PythonTurtleForward = "Ugrás x pixelrel"
+PythonTurtleFunction = "teknös modul funkció elötag"
+PythonTurtleGoto = "Mozgatás (x, y) koordinátákra"
+PythonTurtleHeading = "Visszaadja az aktuális címsort"
 PythonTurtleHideturtle = "A teknös elrejtése"
-PythonTurtleIsdown = "True-t válaszol ha a toll irás pozícióban van"
-PythonTurtleLeft = "a fokkot forduljon balra"
+PythonTurtleIsdown = "Visszatérés igazhoz, ha az toll lefelé"
+PythonTurtleLeft = "Forduljon fokkal balra"
 PythonTurtlePendown = "Húzza le a tollat"
 PythonTurtlePensize = "Állítsa a vonalvastagságot x pixelre"
 PythonTurtlePenup = "Húzza fel a tollat"
-PythonTurtlePosition = "Az aktuális (x,y) pozíciót visszaadása"
-PythonTurtleReset = "Visszaállitani a rajzot (torléssel)"
-PythonTurtleRight = "a fokkot forduljon jobbra"
-PythonTurtleSetheading = "a fokokra állítja be az irányt"
-PythonTurtleSetposition = "A teknös pozicioját allitja"
-PythonTurtleShowturtle = "A teknöst meg mutatni"
+PythonTurtlePosition = "Az aktuális (x, y) hely visszaadása"
+PythonTurtleReset = "A rajz visszaállítása"
+PythonTurtleRight = "Forduljon fokkal jobbra"
+PythonTurtleSetheading = "Állítsa be a tájolást fokokra"
+PythonTurtleSetposition = "A helymeghatározás"
+PythonTurtleShowturtle = "Mutasd a teknösöt"
 PythonTurtleSpeed = "Rajzolási sebesség 0 és 10 között"
-PythonTurtleWrite = "Szöveg irás"
-PythonUniform = "Lebegöpontos szám [a,b] -ban"
-PythonImportTime = "time modul importálása"
-PythonTimePrefix = "time funkció elötag"
-PythonTimeSleep = "n másodpercet várni"
-PythonMonotonic = "Meg fordítani a monoton idö"
+PythonTurtleWrite = "Display a text"
+PythonUniform = "Lebegöpontos szám [a, b] -ben"
+PythonImportTime = "Idömodul importálása"
+PythonTimePrefix = "idömodul funkció elötag"
+PythonTimeSleep = "Várj n másodpercet"
+PythonMonotonic = "Vissza a monoton idö"
 PythonFileOpen = "Fájl megnyitása"
-PythonFileSeekable = "Seek-et lehete használni"
-PythonFileSeek = "A kurzort áthelyezni"
-PythonFileTell = "Visszaadja a kurzor helye"
-PythonFileClose = "Bezárni egy fájlt"
-PythonFileClosed = "True ha a fájl bezárva"
-PythonFileRead = "Olvas 16 bájtig"
-PythonFileWrite = "b-t irjon a fájlba"
-PythonFileReadline = "Olvas egy sort vagy 16 bájtig"
-PythonFileReadlines = "Olvas több sort"
-PythonFileTruncate = "A fájl átméretezése"
-PythonFileWritelines = "Irjon több sort"
-PythonFileName = "A fájl neve"
-PythonFileMode = "A fájl nyitott módja"
-PythonFileReadable = "read-et lehete használni"
-PythonFileWritable = "write-ot lehete használni"
-PythonImportOs = "os modul importálása"
-PythonOsUname = "Rendszer informaciók"
-PythonOsGetlogin = "Get username"
-PythonOsRemove = "Fájl törlése"
-PythonOsRename = "Fájl átnevezése"
-PythonOsListdir = "Fájlok listája"
-PythonImportSys = "sys modul importálása"
-PythonSysExit = "Terminate current program"
-PythonSysPrintexception = "Print exception"
-PythonSysByteorder = "The byte order of the system"
-PythonSysImplementation = "Information about Python"
-PythonSysModules = "Dictionary of loaded modules"
-PythonSysVersion = "Python language version (string)"
-PythonSysVersioninfo = "Python language version (tuple)"
+PythonFileSeekable = "A fájl kereshető?"
+PythonFileSeek = "A fájl kurzorának áthelyezése"
+PythonFileTell = "A fájl kurzorának helye"
+PythonFileClose = "Bezár egy fájlt"
+PythonFileClosed = "Igaz, ha a fájl bezárt"
+PythonFileRead = "Olvasson méretbájtig"
+PythonFileWrite = "B beírása fájlba"
+PythonFileReadline = "Olvas egy sort"
+PythonFileReadlines = "Olvassa a sorok listáját"
+PythonFileTruncate = "A fájl átméretezése méretre"
+PythonFileWritelines = "Sorok listáját írja"
+PythonFileName = "a fájl neve"
+PythonFileMode = "a fájl nyitott módja"
+PythonFileReadable = "A fájl olvasható?"
+PythonFileWritable = "A fájl írható?"

apps/code/catalog.it.i18n

@@ -45,8 +45,6 @@ PythonCosh = "Coseno iperbolico"
 PythonCount = "Conta le ricorrenze di x"
 PythonDegrees = "Conversione di radianti in gradi"
 PythonDivMod = "Quoziente e resto"
-PythonDrawCircle = "Disegnare un cerchio"
-PythonDrawLine = "Disegna una linea"
 PythonDrawString = "Visualizza il testo dal pixel x,y"
 PythonErf = "Funzione d'errore"
 PythonErfc = "Funzione d'errore complementare"
@@ -54,16 +52,12 @@ PythonEval = "Valuta l'espressione nell'argomento "
 PythonExp = "Funzione esponenziale"
 PythonExpm1 = "Calcola exp(x)-1"
 PythonFabs = "Valore assoluto"
-PythonFillCircle = "Riempire un cerchio"
-PythonFillPolygon = "Riempire un poligono"
 PythonFillRect = "Riempie un rettangolo"
 PythonFloat = "Conversione in flottanti"
 PythonFloor = "Parte intera"
 PythonFmod = "a modulo b"
 PythonFrExp = "Mantissa ed esponente di x : (m,e)"
 PythonGamma = "Funzione gamma"
-PythonGetKeys = "Premere i tasti"
-PythonGetPalette = "Ottieni la tavolozza del tema"
 PythonGetPixel = "Restituisce colore del pixel(x,y)"
 PythonGetrandbits = "Numero aleatorio con k bit"
 PythonGrid = "Attiva la visibilità della griglia"
@@ -75,24 +69,13 @@ PythonImportKandinsky = "Importa modulo kandinsky"
 PythonImportRandom = "Importa modulo random"
 PythonImportMath = "Importa modulo math"
 PythonImportMatplotlibPyplot = "Importa modulo matplotlib.pyplot"
-PythonImportNumpy = "Importa modulo ulab.numpy"
-PythonImportScipy = "Importa modulo ulab.scipy"
 PythonImportTurtle = "Importa del modulo turtle"
 PythonImportTime = "Importa del modulo time"
 PythonImportOs = "Importa modulo os"
 PythonOsUname = "Ottieni informazioni sul sistema"
-PythonOsGetlogin = "Get username"
 PythonOsRemove = "Rimuovere un file"
 PythonOsRename = "Rinomina file"
 PythonOsListdir = "Elenca file"
-PythonImportSys = "Importa modulo sys"
-PythonSysExit = "Terminate current program"
-PythonSysPrintexception = "Print exception"
-PythonSysByteorder = "The byte order of the system"
-PythonSysImplementation = "Information about Python"
-PythonSysModules = "Dictionary of loaded modules"
-PythonSysVersion = "Python language version (string)"
-PythonSysVersioninfo = "Python language version (tuple)"
 PythonIndex = "Indice prima occorrenza di x"
 PythonInput = "Inserire un valore"
 PythonInsert = "Inserire x in posizione i-esima"
@@ -101,11 +84,54 @@ PythonIonFunction = "Prefisso di funzione modulo ion"
 PythonIsFinite = "Testa se x è finito"
 PythonIsInfinite = "Testa se x est infinito"
 PythonIsKeyDown = "Restituisce True premendo tasto k"
-PythonBattery = "Return battery voltage"
-PythonBatteryLevel = "Return battery level"
-PythonBatteryIscharging = "Return if battery is charging"
 PythonIsNaN = "Testa se x è NaN"
 PythonKandinskyFunction = "Prefisso funzione modulo kandinsky"
+PythonKeyLeft = "Tasto FRECCIA SINISTRA"
+PythonKeyUp = "Tasto FRECCIA ALTO"
+PythonKeyDown = "Tasto FRECCIA BASSO"
+PythonKeyRight = "Tasto FRECCIA DESTRA"
+PythonKeyOk = "Tasto OK"
+PythonKeyBack = "Tasto INDIETRO"
+PythonKeyHome = "Tasto CASA"
+PythonKeyOnOff = "Tasto ON/OFF"
+PythonKeyShift = "Tasto SHIFT"
+PythonKeyAlpha = "Tasto ALPHA"
+PythonKeyXnt = "Tasto X,N,T"
+PythonKeyVar = "Tasto VAR"
+PythonKeyToolbox = "Tasto TOOLBOX"
+PythonKeyBackspace = "Tasto CANCELLA"
+PythonKeyExp = "Tasto ESPONENZIALE"
+PythonKeyLn = "Tasto LOGARITMO NEPERIANO"
+PythonKeyLog = "Tasto LOGARITMO DECIMALE"
+PythonKeyImaginary = "Tasto I IMMAGINE"
+PythonKeyComma = "Tasto VIRGOLA"
+PythonKeyPower = "Tasto POTENZA"
+PythonKeySine = "Tasto SENO"
+PythonKeyCosine = "Tasto COSENO"
+PythonKeyTangent = "Tasto TANGENTE"
+PythonKeyPi = "Tasto PI"
+PythonKeySqrt = "Tasto RADICE QUADRATA"
+PythonKeySquare = "Tasto QUADRATO"
+PythonKeySeven = "Tasto 7"
+PythonKeyEight = "Tasto 8"
+PythonKeyNine = "Tasto 9"
+PythonKeyLeftParenthesis = "Tasto PARENTESI SINISTRA"
+PythonKeyRightParenthesis = "Tasto PARENTESI DESTRA"
+PythonKeyFour = "Tasto 4"
+PythonKeyFive = "Tasto 5"
+PythonKeySix = "Tasto 6"
+PythonKeyMultiplication = "Tasto MOLTIPLICAZIONE"
+PythonKeyDivision = "Tasto DIVISIONE"
+PythonKeyOne = "Tasto 1"
+PythonKeyTwo = "Tasto 2"
+PythonKeyThree = "Tasto 3"
+PythonKeyPlus = "Tasto PIÙ"
+PythonKeyMinus = "Tasto MENO"
+PythonKeyZero = "Tasto 0"
+PythonKeyDot = "Tasto PUNTO"
+PythonKeyEe = "Tasto 10 POTENZA X"
+PythonKeyAns = "Tasto ANS"
+PythonKeyExe = "Tasto EXE"
 PythonLdexp = "Inversa di frexp : x*(2**i)"
 PythonLength = "Longhezza di un oggetto"
 PythonLgamma = "Logaritmo della funzione gamma"
@@ -118,14 +144,6 @@ PythonMax = "Massimo"
 PythonMin = "Minimo"
 PythonModf = "Parti frazionarie e intere"
 PythonMonotonic = "Restituisce il valore dell'orologio"
-PythonNumpyFunction = "Prefisso modulo numpy"
-PythonNumpyFftFunction = "Prefisso modulo numpy.fft"
-PythonNumpyLinalgFunction = "Prefisso modulo numpy.linalg"
-PythonScipyFunction = "Prefisso modulo scipy"
-PythonScipyLinalgFunction = "Prefisso modulo scipy.linalg"
-PythonScipyOptimizeFunction = "Prefisso modulo scipy.optimize"
-PythonScipySignalFunction = "Prefisso modulo scipy.signal"
-PythonScipySpecialFunction = "Prefisso modulo scipy.special"
 PythonOct = "Conversione in ottale"
 PythonPhase = "Argomento di z"
 PythonPlot = "Disegna y in f. di x come linee"
@@ -151,12 +169,6 @@ PythonShow = "Mostra la figura"
 PythonSin = "Seno"
 PythonSinh = "Seno iperbolico"
 PythonSleep = "Sospende l'esecuzione t secondi"
-PythonLocalTime = "Converti il tempo in tuple"
-PythonMktime = "Converti tuple in tempo"
-PythonTime = "Ottieni il timestamp corrente"
-PythonSetLocaltime = "Imposta il tempo da una tupla"
-PythonRTCmode = "Ottieni la modalità RTC corrente"
-PythonSetRTCmode = "Imposta modalità RTC"
 PythonSort = "Ordina l'elenco"
 PythonSqrt = "Radice quadrata"
 PythonSum = "Somma degli elementi della lista"

apps/code/catalog.nl.i18n

@@ -45,8 +45,6 @@ PythonCosh = "Cosinus hyperbolicus"
 PythonCount = "Tel voorkomen van x"
 PythonDegrees = "Zet x om van radialen naar graden"
 PythonDivMod = "Quotiënt en rest"
-PythonDrawCircle = "Teken een cirkel"
-PythonDrawLine = "Teken een lijn"
 PythonDrawString = "Geef een tekst weer van pixel (x,y)"
 PythonErf = "Error functie"
 PythonErfc = "Complementaire error functie"
@@ -54,16 +52,12 @@ PythonEval = "Geef de geëvalueerde uitdrukking"
 PythonExp = "Exponentiële functie"
 PythonExpm1 = "Bereken exp(x)-1"
 PythonFabs = "Absolute waarde"
-PythonFillCircle = "Vul een cirkel"
-PythonFillPolygon = "Vul een veelhoek"
 PythonFillRect = "Vul een rechthoek bij pixel (x,y)"
 PythonFloat = "Zet x om in een float"
 PythonFloor = "Vloer"
 PythonFmod = "a modulo b"
 PythonFrExp = "Mantisse en exponent van x: (m,e)"
 PythonGamma = "Gammafunctie"
-PythonGetKeys = "Get toetsen ingedrukt"
-PythonGetPalette = "Thema palet krijgen"
 PythonGetPixel = "Geef pixel (x,y) kleur (rgb)"
 PythonGetrandbits = "Integer met k willekeurige bits"
 PythonGrid = "Verander zichtbaarheid raster"
@@ -75,24 +69,12 @@ PythonImportKandinsky = "Importeer kandinsky module"
 PythonImportRandom = "Importeer random module"
 PythonImportMath = "Importeer math module"
 PythonImportMatplotlibPyplot = "Importeer matplotlib.pyplot module"
-PythonImportNumpy = "Importeer ulab.numpy module"
-PythonImportScipy = "Importeer ulab.scipy module"
 PythonImportTime = "Importeer time module"
 PythonImportOs = "Importeer os module"
 PythonOsUname = " Krijg systeeminfo"
-PythonOsGetlogin = "Get username"
 PythonOsRemove = "Een bestand verwijderen"
 PythonOsRename = "Hernoem bestand"
 PythonOsListdir = "Lijstbestanden"
-PythonImportSys = "Importeer sys module"
-PythonImportSys = "Importeer sys module"
-PythonSysExit = "Terminate current program"
-PythonSysPrintexception = "Print exception"
-PythonSysByteorder = "The byte order of the system"
-PythonSysImplementation = "Information about Python"
-PythonSysModules = "Dictionary of loaded modules"
-PythonSysVersion = "Python language version (string)"
-PythonSysVersioninfo = "Python language version (tuple)"
 PythonImportTurtle = "Importeer turtle module"
 PythonIndex = "Index van de eerste x aanwezigheden"
 PythonInput = "Wijs een waarde toe"
@@ -102,11 +84,54 @@ PythonIonFunction = "ion module voorvoegsel"
 PythonIsFinite = "Controleer of x eindig is"
 PythonIsInfinite = "Controleer of x oneindig is"
 PythonIsKeyDown = "Geef True als k toets omlaag is"
-PythonBattery = "Return battery voltage"
-PythonBatteryLevel = "Return battery level"
-PythonBatteryIscharging = "Return if battery is charging"
 PythonIsNaN = "Controleer of x geen getal is"
 PythonKandinskyFunction = "kandinsky module voorvoegsel"
+PythonKeyLeft = "PIJL NAAR LINKS toets"
+PythonKeyUp = "PIJL OMHOOG toets"
+PythonKeyDown = "PIJL OMLAAG toets"
+PythonKeyRight = "PIJL NAAR RECHTS toets"
+PythonKeyOk = "OK toets"
+PythonKeyBack = "TERUG toets"
+PythonKeyHome = "HOME toets"
+PythonKeyOnOff = "AAN/UIT toets"
+PythonKeyShift = "SHIFT toets"
+PythonKeyAlpha = "ALPHA toets"
+PythonKeyXnt = "X,N,T toets"
+PythonKeyVar = "VAR toets"
+PythonKeyToolbox = "TOOLBOX toets"
+PythonKeyBackspace = "BACKSPACE toets"
+PythonKeyExp = "EXPONENTIEEL toets"
+PythonKeyLn = "NATUURLIJKE LOGARITME toets"
+PythonKeyLog = "BRIGGSE LOGARITME toets"
+PythonKeyImaginary = "IMAGINAIRE I toets"
+PythonKeyComma = "KOMMA toets"
+PythonKeyPower = "MACHT toets"
+PythonKeySine = "SINUS toets"
+PythonKeyCosine = "COSINUS toets"
+PythonKeyTangent = "TANGENS toets"
+PythonKeyPi = "PI toets"
+PythonKeySqrt = "VIERKANTSWORTEL toets"
+PythonKeySquare = "KWADRAAT toets"
+PythonKeySeven = "7 toets"
+PythonKeyEight = "8 toets"
+PythonKeyNine = "9 toets"
+PythonKeyLeftParenthesis = "HAAKJE OPENEN toets"
+PythonKeyRightParenthesis = "HAAKJE SLUITEN toets"
+PythonKeyFour = "4 toets"
+PythonKeyFive = "5 toets"
+PythonKeySix = "6 toets"
+PythonKeyMultiplication = "VERMENIGVULDIGEN toets"
+PythonKeyDivision = "DELEN toets"
+PythonKeyOne = "1 toets"
+PythonKeyTwo = "2 toets"
+PythonKeyThree = "3 toets"
+PythonKeyPlus = "PLUS toets"
+PythonKeyMinus = "MIN toets"
+PythonKeyZero = "0 toets"
+PythonKeyDot = "PUNT toets"
+PythonKeyEe = "10 TOT DE MACHT X toets"
+PythonKeyAns = "ANS toets"
+PythonKeyExe = "EXE toets"
 PythonLdexp = "Geeft x*(2**i), inversie van frexp"
 PythonLength = "Lengte van een object"
 PythonLgamma = "Log-gammafunctie"
@@ -119,14 +144,6 @@ PythonMax = "Maximum"
 PythonMin = "Minimum"
 PythonModf = "Fractionele en gehele delen van x"
 PythonMonotonic = "Waarde van een monotone klok"
-PythonNumpyFunction = "numpy module prefix"
-PythonNumpyFftFunction = "numpy.fft module prefix"
-PythonNumpyLinalgFunction = "numpy.linalg module prefix"
-PythonScipyFunction = "scipy module prefix"
-PythonScipyLinalgFunction = "scipy.linalg module prefix"
-PythonScipyOptimizeFunction = "scipy.optimize module prefix"
-PythonScipySignalFunction = "scipy.signal module prefix"
-PythonScipySpecialFunction = "scipy.special module prefix"
 PythonOct = "Integer omzetten naar octaal"
 PythonPhase = "Fase van z in radialen"
 PythonPlot = "Plot y versus x als lijnen"
@@ -152,12 +169,6 @@ PythonShow = "Figuur weergeven"
 PythonSin= "Sinus"
 PythonSinh = "Sinus hyperbolicus"
 PythonSleep = "Stel executie voor t seconden uit"
-PythonLocalTime = "Zet tijd om in tuple"
-PythonMktime = "Tuple omzetten in tijd"
-PythonTime = "Haal de huidige tijdstempel"
-PythonSetLocaltime = "Stel de tijd in vanaf een tuple"
-PythonRTCmode = "Huidige RTC-modus kregen"
-PythonSetRTCmode = "RTC-modus instellen"
 PythonSort = "Sorteer de lijst"
 PythonSqrt = "Vierkantswortel"
 PythonSum = "Sommeer de items van een lijst"

apps/code/catalog.pt.i18n

@@ -45,8 +45,6 @@ PythonCosh = "Cosseno hiperbólico"
 PythonCount = "Contar as ocorrências de x"
 PythonDegrees = "Converter x de radianos para graus"
 PythonDivMod = "Quociente e resto"
-PythonDrawCircle = "Desenha um círculo"
-PythonDrawLine = "Desenhe uma linha"
 PythonDrawString = "Mostrar o texto do pixel (x,y)"
 PythonErf = "Função erro"
 PythonErfc = "Função erro complementar"
@@ -54,16 +52,12 @@ PythonEval = "Devolve a expressão avaliada"
 PythonExp = "Função exponencial"
 PythonExpm1 = "Calcular exp(x)-1"
 PythonFabs = "Valor absoluto"
-PythonFillCircle = "Preencher um círculo"
-PythonFillPolygon = "Preencher um polígono"
 PythonFillRect = "Preencher um retângulo em (x,y)"
 PythonFloat = "Converter x num flutuante"
 PythonFloor = "Parte inteira"
 PythonFmod = "a módulo b"
 PythonFrExp = "Coeficiente e expoente de x: (m, e)"
 PythonGamma = "Função gama"
-PythonGetKeys = "Obter teclas pressionadas"
-PythonGetPalette = "Obter paleta temática"
 PythonGetPixel = "Devolve a cor do pixel (x,y)"
 PythonGetrandbits = "Número inteiro aleatório com k bits"
 PythonGrid = "Alterar visibilidade da grelha"
@@ -75,8 +69,6 @@ PythonImportKandinsky = "Importar módulo kandinsky"
 PythonImportRandom = "Importar módulo random"
 PythonImportMath = "Importar módulo math"
 PythonImportMatplotlibPyplot = "Importar módulo matplotlib.pyplot"
-PythonImportNumpy = "Importar módulo ulab.numpy"
-PythonImportScipy = "Importar módulo ulab.scipy"
 PythonImportTime = "Importar módulo time"
 PythonImportTurtle = "Importar módulo turtle"
 PythonIndex = "Índice da primeira ocorrência de x"
@@ -87,11 +79,54 @@ PythonIonFunction = "Prefixo da função do módulo ion"
 PythonIsFinite = "Verificar se x é finito"
 PythonIsInfinite = "Verificar se x é infinito"
 PythonIsKeyDown = "Devolve True se tecla k pressionada"
-PythonBattery = "Return battery voltage"
-PythonBatteryLevel = "Return battery level"
-PythonBatteryIscharging = "Return if battery is charging"
 PythonIsNaN = "Verificar se x é um NaN"
 PythonKandinskyFunction = "Prefixo da função do módulo kandinsky"
+PythonKeyLeft = "tecla SETA ESQUERDA"
+PythonKeyUp = "tecla SETA CIMA "
+PythonKeyDown = "tecla SETA BAIXO"
+PythonKeyRight = "tecla SETA DIREITA"
+PythonKeyOk = "tecla OK"
+PythonKeyBack = "tecla VOLTAR"
+PythonKeyHome = "tecla HOME"
+PythonKeyOnOff = "tecla ON/OFF"
+PythonKeyShift = "tecla SHIFT"
+PythonKeyAlpha = "tecla ALPHA"
+PythonKeyXnt = "tecla X,N,T"
+PythonKeyVar = "tecla VAR"
+PythonKeyToolbox = "tecla CAIXA DE FERRAMENTAS"
+PythonKeyBackspace = "tecla APAGAR"
+PythonKeyExp = "tecla EXPONENCIAL"
+PythonKeyLn = "tecla LOGARITMO NATURAL"
+PythonKeyLog = "tecla LOGARITMO DECIMAL"
+PythonKeyImaginary = "tecla I IMAGINÁRIO"
+PythonKeyComma = "tecla VÍRGULA"
+PythonKeyPower = "tecla EXPOENTE"
+PythonKeySine = "tecla SENO"
+PythonKeyCosine = "tecla COSSENO"
+PythonKeyTangent = "tecla TANGENTE"
+PythonKeyPi = "tecla PI"
+PythonKeySqrt = "tecla RAIZ QUADRADA"
+PythonKeySquare = "tecla AO QUADRADO"
+PythonKeySeven = "tecla 7"
+PythonKeyEight = "tecla 8"
+PythonKeyNine = "tecla 9"
+PythonKeyLeftParenthesis = "tecla PARÊNTESE ESQUERDO"
+PythonKeyRightParenthesis = "tecla PARÊNTESE DIREITO"
+PythonKeyFour = "tecla 4"
+PythonKeyFive = "tecla 5"
+PythonKeySix = "tecla 6"
+PythonKeyMultiplication = "tecla MULTIPLICAÇÃO"
+PythonKeyDivision = "tecla DIVISÃO"
+PythonKeyOne = "tecla 1"
+PythonKeyTwo = "tecla 2"
+PythonKeyThree = "tecla 3"
+PythonKeyPlus = "tecla MAIS"
+PythonKeyMinus = "tecla MENOS"
+PythonKeyZero = "tecla 0"
+PythonKeyDot = "tecla PONTO"
+PythonKeyEe = "tecla 10 expoente X"
+PythonKeyAns = "tecla ANS"
+PythonKeyExe = "tecla EXE"
 PythonLdexp = "Devolve x*(2**i), inverso de frexp"
 PythonLength = "Comprimento de um objeto"
 PythonLgamma = "Logaritmo da função gama"
@@ -104,14 +139,6 @@ PythonMax = "Máximo"
 PythonMin = "Mínimo"
 PythonModf = "Partes inteira e frácionária de x"
 PythonMonotonic = "Devolve o valor do relógio"
-PythonNumpyFunction = "Prefixo do módulo numpy"
-PythonNumpyFftFunction = "Prefixo do módulo numpy.fft"
-PythonNumpyLinalgFunction = "Prefixo do módulo numpy.linalg"
-PythonScipyFunction = "Prefixo do módulo scipy"
-PythonScipyLinalgFunction = "Prefixo do módulo scipy.linalg"
-PythonScipyOptimizeFunction = "Prefixo do módulo scipy.optimize"
-PythonScipySignalFunction = "Prefixo do módulo scipy.signal"
-PythonScipySpecialFunction = "Prefixo do módulo scipy.special"
 PythonOct = "Converter número inteiro em octal"
 PythonPhase = "Argumento de z"
 PythonPlot = "Desenhar y em função de x"
@@ -137,12 +164,6 @@ PythonShow = "Mostrar a figura"
 PythonSin = "Seno"
 PythonSinh = "Seno hiperbólico"
 PythonSleep = "Suspender a execução por t segundos"
-PythonLocalTime = "Convert o tempo em tupla"
-PythonMktime = "Convert tuple em tempo"
-PythonTime = "Obter o estamp de tempo atual"
-PythonSetLocaltime = "Definir tempo a partir de uma tupla"
-PythonRTCmode = "Obter o modo RTC atual"
-PythonSetRTCmode = "Definir o modo RTC"
 PythonSort = "Ordenar a lista"
 PythonSqrt = "Raiz quadrada"
 PythonSum = "Soma dos itens da lista"
@@ -177,18 +198,9 @@ PythonUniform = "Número decimal em [a,b]"
 PythonImportTime = "Import time module"
 PythonImportOs = "Import os module"
 PythonOsUname = " Obter informações do sistema"
-PythonOsGetlogin = "Get username"
 PythonOsRemove = "Remover um ficheiro"
 PythonOsRename = "Renomear ficheiro"
 PythonOsListdir = "Listar ficheiros"
-PythonImportSys = "Import sys module"
-PythonSysExit = "Terminate current program"
-PythonSysPrintexception = "Print exception"
-PythonSysByteorder = "The byte order of the system"
-PythonSysImplementation = "Information about Python"
-PythonSysModules = "Dictionary of loaded modules"
-PythonSysVersion = "Python language version (string)"
-PythonSysVersioninfo = "Python language version (tuple)"
 PythonTimePrefix = "time module function prefix"
 PythonTimeSleep = "Wait for n second"
 PythonMonotonic = "Return monotonic time"

apps/code/catalog.universal.i18n

@@ -50,8 +50,6 @@ PythonCommandCount = "list.count(x)"
 PythonCommandCountWithoutArg = ".count(\x11)"
 PythonCommandDegrees = "degrees(x)"
 PythonCommandDivMod = "divmod(a,b)"
-PythonCommandDrawCircle = "draw_circle(x,y,r,color)"
-PythonCommandDrawLine = "draw_line(x1,y1,x2,y2,color)"
 PythonCommandDrawString = "draw_string(\"text\",x,y)"
 PythonCommandConstantE = "e"
 PythonCommandErf = "erf(x)"
@@ -61,16 +59,12 @@ PythonCommandExp = "exp(x)"
 PythonCommandExpComplex = "exp(z)"
 PythonCommandExpm1 = "expm1(x)"
 PythonCommandFabs = "fabs(x)"
-PythonCommandFillCircle = "fill_circle(x,y,r,color)"
-PythonCommandFillPolygon = "fill_polygon([(x1,y1),...],color)"
 PythonCommandFillRect = "fill_rect(x,y,width,height,color)"
 PythonCommandFloat = "float(x)"
 PythonCommandFloor = "floor(x)"
 PythonCommandFmod = "fmod(a,b)"
 PythonCommandFrExp = "frexp(x)"
 PythonCommandGamma = "gamma(x)"
-PythonCommandGetKeys = "get_keys()"
-PythonCommandGetPalette = "get_palette()"
 PythonCommandGetPixel = "get_pixel(x,y)"
 PythonCommandGetrandbits = "getrandbits(k)"
 PythonCommandGrid = "grid()"
@@ -91,13 +85,9 @@ PythonCommandImportIon = "import ion"
 PythonCommandImportKandinsky = "import kandinsky"
 PythonCommandImportMath = "import math"
 PythonCommandImportMatplotlibPyplot = "import matplotlib.pyplot"
-PythonCommandImportFromNumpy = "from ulab import numpy as np"
-PythonCommandImportFromScipy = "from ulab import scipy as spy"
 PythonCommandImportRandom = "import random"
 PythonCommandImportOs = "import os"
 PythonCommandImportFromOs = "from os import *"
-PythonCommandImportSys = "import sys"
-PythonCommandImportFromSys = "from sys import *"
 PythonCommandImportTime = "import time"
 PythonCommandImportTurtle = "import turtle"
 PythonCommandIndex = "list.index(x)"
@@ -160,9 +150,6 @@ PythonCommandKeyEe = "KEY_EE"
 PythonCommandKeyAns = "KEY_ANS"
 PythonCommandKeyExe = "KEY_EXE"
 PythonCommandIsKeyDown = "keydown(k)"
-PythonCommandBattery = "battery()"
-PythonCommandBatteryLevel = "battery_level()"
-PythonCommandBatteryIscharging = "battery_ischarging()"
 PythonCommandLdexp = "ldexp(x,i)"
 PythonCommandLength = "len(object)"
 PythonCommandLgamma = "lgamma(x)"
@@ -178,120 +165,6 @@ PythonCommandMax = "max(list)"
 PythonCommandMin = "min(list)"
 PythonCommandModf = "modf(x)"
 PythonCommandMonotonic = "monotonic()"
-PythonCommandNumpyArray = "np.array(a)"
-PythonCommandNumpyArange = "np.arange(i)"
-PythonCommandNumpyConcatenate = "np.concatenate(a,b)"
-PythonCommandNumpyDiag = "np.diag(a)"
-PythonCommandNumpyZeros = "np.zeros(s)"
-PythonCommandNumpyOnes = "np.ones(s)"
-PythonCommandNumpyEmpty = "np.empty(s)"
-PythonCommandNumpyEye = "np.eye(n, m)"
-PythonCommandNumpyFull = "np.full(s, v)"
-PythonCommandNumpyLinspace = "np.linspace(s, e)"
-PythonCommandNumpyLogspace = "np.logspace(s, e)"
-PythonCommandNumpyCopy = "ndarray.copy()"
-PythonCommandNumpyCopyWithoutArg = ".copy()"
-PythonCommandNumpyDtype = "ndarray.dtype"
-PythonCommandNumpyDtypeWithoutArg = ".dtype"
-PythonCommandNumpyFlat = "ndarray.flat"
-PythonCommandNumpyFlatWithoutArg = ".flat"
-PythonCommandNumpyFlatten = "ndarray.flatten()"
-PythonCommandNumpyFlattenWithoutArg = ".flatten()"
-PythonCommandNumpyShape = "ndarray.shape"
-PythonCommandNumpyShapeWithoutArg = ".shape"
-PythonCommandNumpyReshape = "ndarray.reshape(s)"
-PythonCommandNumpyReshapeWithoutArg = ".reshape(\x11)"
-PythonCommandNumpySize = "ndarray.size"
-PythonCommandNumpySizeWithoutArg = ".size"
-PythonCommandNumpyTranspose = "ndarray.transpose()"
-PythonCommandNumpyTransposeWithoutArg = ".transpose()"
-PythonCommandNumpySort = "ndarray.sort()"
-PythonCommandNumpySortWithoutArg = ".sort()"
-PythonCommandNumpyFromBuffer = "ndarray.frombuffer(b)"
-PythonCommandNumpyToBytes = "ndarray.tobytes()"
-PythonCommandNumpyToBytesWithoutArg = ".tobytes()"
-PythonCommandNumpySetPrintOptions = "np.set_printoptions()"
-PythonCommandNumpyGetPrintOptions = "np.get_printoptions()"
-PythonCommandNumpyNdinfo = "np.ndinfo(a)"
-PythonCommandNumpyAll = "np.all(a)"
-PythonCommandNumpyAny = "np.any(a)"
-PythonCommandNumpyArgmax = "np.argmax(a)"
-PythonCommandNumpyArgmin = "np.argmin(a)"
-PythonCommandNumpyArgsort = "np.argsort(a)"
-PythonCommandNumpyClip = "np.clip(a, min, max)"
-PythonCommandNumpyConvolve = "np.convolve(a, b)"
-PythonCommandNumpyDiff = "np.diff(a)"
-PythonCommandNumpyInterp = "np.interp(a)"
-PythonCommandNumpyDot = "np.dot(a, b)"
-PythonCommandNumpyCross = "np.cross(a, b)"
-PythonCommandNumpyEqual = "np.equal(a, b)"
-PythonCommandNumpyNot_equal = "np.not_equal(a, b)"
-PythonCommandNumpyFlip = "np.flip(a)"
-PythonCommandNumpyIsfinite = "np.isfinite(a)"
-PythonCommandNumpyIsinf = "np.isinf(a)"
-PythonCommandNumpyMean = "np.mean(a)"
-PythonCommandNumpyMin = "np.min(a)"
-PythonCommandNumpyMax = "np.max(a)"
-PythonCommandNumpyMedian = "np.median(a)"
-PythonCommandNumpyMinimum = "np.minimum(a, b)"
-PythonCommandNumpyMaximum = "np.maximum(a, b)"
-PythonCommandNumpyPolyfit = "np.polyfit(a, b, y)"
-PythonCommandNumpyPolyval = "np.polyval(p, x)"
-PythonCommandNumpyRoll = "np.roll(a, n)"
-PythonCommandNumpySortWithArguments = "np.sort(a)"
-PythonCommandNumpyStd = "np.std(a)"
-PythonCommandNumpySum = "np.sum(a)"
-PythonCommandNumpyTrace = "np.trace(a)"
-PythonCommandNumpyTrapz = "np.trapz(y)"
-PythonCommandNumpyWhere = "np.where(c, x, y)"
-PythonCommandNumpyVectorize = "np.vectorize(f)"
-PythonCommandNumpyAcos = "np.acos(a)"
-PythonCommandNumpyAcosh = "np.acosh(a)"
-PythonCommandNumpyArctan2 = "np.arctan2(a)"
-PythonCommandNumpyAround = "np.around(a)"
-PythonCommandNumpyAsin = "np.asin(a)"
-PythonCommandNumpyAsinh = "np.asinh(a)"
-PythonCommandNumpyAtan = "np.atan(a)"
-PythonCommandNumpyAtanh = "np.atanh(a)"
-PythonCommandNumpyCeil = "np.ceil(a)"
-PythonCommandNumpyCos = "np.cos(a)"
-PythonCommandNumpyCosh = "np.cosh(a)"
-PythonCommandNumpyDegrees = "np.degrees(a)"
-PythonCommandNumpyExp = "np.exp(a)"
-PythonCommandNumpyExpm1 = "np.expm1(a)"
-PythonCommandNumpyFloor = "np.floor(a)"
-PythonCommandNumpyLog = "np.log(a)"
-PythonCommandNumpyLog10 = "np.log10(a)"
-PythonCommandNumpyLog2 = "np.log2(a)"
-PythonCommandNumpyRadians = "np.radians(a)"
-PythonCommandNumpySin = "np.sin(a)"
-PythonCommandNumpySinh = "np.sinh(a)"
-PythonCommandNumpySqrt = "np.sqrt(a)"
-PythonCommandNumpyTan = "np.tan(a)"
-PythonCommandNumpyTanh = "np.tanh(a)"
-PythonCommandNumpyBool = "np.bool"
-PythonCommandNumpyFloat = "np.float"
-PythonCommandNumpyUint8 = "np.uint8"
-PythonCommandNumpyInt8 = "np.int8"
-PythonCommandNumpyUint16 = "np.uint16"
-PythonCommandNumpyInt16 = "np.int16"
-PythonCommandNumpyNan = "np.nan"
-PythonCommandNumpyInf = "np.inf"
-PythonCommandNumpyE = "np.e"
-PythonCommandNumpyPi = "np.pi"
-PythonCommandNumpyFft = "np.fft.fft(a)"
-PythonCommandNumpyIfft = "np.fft.ifft(a)"
-PythonCommandNumpyDet = "np.linalg.det(a)"
-PythonCommandNumpyEig = "np.linalg.eig(a)"
-PythonCommandNumpyCholesky = "np.linalg.cholesky(a)"
-PythonCommandNumpyInv = "np.linalg.inv(a)"
-PythonCommandNumpyNorm = "np.linalg.norm(a)"
-PythonCommandNumpyFunction = "np.function"
-PythonCommandNumpyFunctionWithoutArg = "np.\x11"
-PythonCommandNumpyFftFunction = "np.fft.function"
-PythonCommandNumpyFftFunctionWithoutArg = "np.fft.\x11"
-PythonCommandNumpyLinalgFunction = "np.linalg.function"
-PythonCommandNumpyLinalgFunctionWithoutArg = "np.linalg.\x11"
 PythonCommandOct = "oct(x)"
 PythonCommandPhase = "phase(z)"
 PythonCommandPlot = "plot(x,y,color)"
@@ -318,39 +191,12 @@ PythonCommandReverseWithoutArg = ".reverse()"
 PythonCommandRound = "round(x,n)"
 PythonCommandScatter = "scatter(x,y)"
 PythonCommandSeed = "seed(x)"
-PythonCommandScipyFunction = "spy.function"
-PythonCommandScipyFunctionWithoutArg = "spy.\x11"
-PythonCommandScipyLinalgFunction = "spy.linalg.function"
-PythonCommandScipyLinalgFunctionWithoutArg = "spy.linalg.\x11"
-PythonCommandScipyOptimizeFunction = "spy.optimize.function"
-PythonCommandScipyOptimizeFunctionWithoutArg = "spy.optimize.\x11"
-PythonCommandScipySignalFunction = "spy.signal.function"
-PythonCommandScipySignalFunctionWithoutArg = "spy.signal.\x11"
-PythonCommandScipySpecialFunction = "spy.special.function"
-PythonCommandScipySpecialFunctionWithoutArg = "spy.special.\x11"
-PythonCommandScipyLinalgChoSolve = "spy.linalg.cho_solve(a, b)"
-PythonCommandScipyLinalgSolveTriangular = "spy.linalg.solve_triangular(a, b)"
-PythonCommandScipyOptimizeBisect = "spy.optimize.bisect(f, a, b)"
-PythonCommandScipyOptimizeFmin = "spy.optimize.fmin(f, x0)"
-PythonCommandScipyOptimizeNewton = "spy.optimize.newton(f, x0)"
-PythonCommandScipySignalSosfilt = "spy.signal.sosfilt(sos, x)"
-PythonCommandScipySignalSpectrogram = "spy.signal.spectrogram(y)"
-PythonCommandScipySpecialErf = "spy.erf(a)"
-PythonCommandScipySpecialErfc = "spy.erfc(a)"
-PythonCommandScipySpecialGamma = "spy.gamma(a)"
-PythonCommandScipySpecialGammaln = "spy.gammaln(a)"
 PythonCommandSetPixel = "set_pixel(x,y,color)"
 PythonCommandShow = "show()"
 PythonCommandSin = "sin(x)"
 PythonCommandSinComplex = "sin(z)"
 PythonCommandSinh = "sinh(x)"
 PythonCommandSleep = "sleep(t)"
-PythonCommandLocalTime = "localtime([timestamp])"
-PythonCommandMktime = "mktime(tm)"
-PythonCommandTime = "time()"
-PythonCommandSetLocaltime = "setlocaltime(tm)"
-PythonCommandRTCmode = "rtcmode()"
-PythonCommandSetRTCmode = "setrtcmode(mode)"
 PythonCommandSort = "list.sort()"
 PythonCommandSortWithoutArg = ".sort()"
 PythonCommandSorted = "sorted(list)"
@@ -369,20 +215,11 @@ PythonCommandUniform = "uniform(a,b)"
 PythonConstantE = "2.718281828459045"
 PythonConstantPi = "3.141592653589793"
 PythonOsCommandUname = "uname()"
-PythonOsCommandGetlogin = "getlogin()"
 PythonOsCommandRemove = "remove(filename)"
 PythonOsCommandRename = "rename(oldname, newname)"
 PythonOsCommandRemoveWithoutArg = "remove(\x11)"
 PythonOsCommandRenameWithoutArg = "rename(\x11,)"
 PythonOsCommandListdir = "listdir()"
-PythonSysCommandExit = "exit()"
-PythonSysCommandPrintexception = "print_exception(exc)"
-PythonSysCommandPrintexceptionWithoutArg = "print_exception(\x11)"
-PythonSysCommandByteorder = "byteorder"
-PythonSysCommandImplementation = "implementation"
-PythonSysCommandModules = "modules"
-PythonSysCommandVersion = "version"
-PythonSysCommandVersioninfo = "version_info"
 PythonTurtleCommandBackward = "backward(x)"
 PythonTurtleCommandCircle = "circle(r)"
 PythonTurtleCommandColor = "color('c')"

apps/code/editor_view.cpp

@@ -102,7 +102,7 @@ void EditorView::GutterView::setOffset(KDCoordinate offset) {
 
 KDSize EditorView::GutterView::minimalSizeForOptimalDisplay() const {
   int numberOfChars = 2; // TODO: Could be computed
-  return KDSize(2 * k_margin + numberOfChars * m_font->glyphSize().width(), 0);
+  return KDSize(2 * k_margin + numberOfChars * Poincare::Preferences::sharedPreferences()->KDPythonFont()->glyphSize().width(), 0);
 }
 
 }

apps/code/python_text_area.cpp

@@ -3,7 +3,6 @@
 #include <escher/palette.h>
 #include <ion/unicode/utf8_helper.h>
 #include <python/port/port.h>
-#include "../global_preferences.h"
 
 extern "C" {
 #include "py/nlr.h"
@@ -445,11 +444,6 @@ void PythonTextArea::addAutocompletion() {
 }
 
 bool PythonTextArea::addAutocompletionTextAtIndex(int nextIndex, int * currentIndexToUpdate) {
-  // If Autocomplete disable, skip this step
-  if(!GlobalPreferences::sharedGlobalPreferences()->autocomplete()) {
-    return false;
-  }
-
   // The variable box should be loaded at this point
   const char * autocompletionTokenBeginning = nullptr;
   const char * autocompletionLocation = const_cast<char *>(cursorLocation());

apps/code/python_toolbox.cpp

@@ -5,7 +5,6 @@ extern "C" {
 #include <string.h>
 #include <ctype.h>
 }
-#include "app.h"
 
 namespace Code {
 
@@ -135,173 +134,6 @@ const ToolboxMessageTree MatplotlibPyplotModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandColorGray, I18n::Message::PythonColorGray, false)
 };
 
-#if defined(INCLUDE_ULAB)
-
-const ToolboxMessageTree NumpyNdarrayModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyArray),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyArange),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyConcatenate),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyDiag),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyZeros),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyOnes),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyEmpty),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyEye),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFull),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyLinspace),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyLogspace),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFromBuffer),  
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyCopy, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyCopyWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyDtype, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyDtypeWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFlat, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyFlatWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFlatten, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyFlattenWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyShape, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyShapeWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyReshape, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyReshapeWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySize, I18n::Message::Default, false, I18n::Message::PythonCommandNumpySizeWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyTranspose, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyTransposeWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySort, I18n::Message::Default, false, I18n::Message::PythonCommandNumpySortWithoutArg),  
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyToBytes, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyToBytesWithoutArg)
-};
-
-const ToolboxMessageTree NumpyFunctionsModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyNdinfo),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyAll),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyAny),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyArgmax),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyArgmin),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyArgsort),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyClip),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyConvolve),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyDiff),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyInterp),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyDot),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyCross),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyEqual),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyNot_equal),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFlip),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyIsfinite),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyIsinf),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyMean),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyMin),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyMax),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyMedian),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyMinimum),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyMaximum),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyPolyfit),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyPolyval),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyRoll),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySortWithArguments),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyStd),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySum),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyTrace),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyTrapz),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyWhere),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyVectorize),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyAcos),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyAcosh),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyArctan2),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyAround),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyAsin),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyAsinh),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyAtan),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyAtanh),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyCeil),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyCos),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyCosh),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyDegrees),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyExp),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyExpm1),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFloor),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyLog),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyLog10),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyLog2),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyRadians),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySin),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySinh),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySqrt),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyTan),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyTanh),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyBool),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFloat),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyUint8),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyInt8),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyUint16),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyInt16),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyNan),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyInf),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyE),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyPi),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySetPrintOptions),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyGetPrintOptions)
-};
-
-const ToolboxMessageTree NumpyFftModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFftFunction, I18n::Message::PythonNumpyFftFunction, false, I18n::Message::PythonCommandNumpyFftFunctionWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFft),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyIfft)
-};
-
-const ToolboxMessageTree NumpyLinalgModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyLinalgFunction, I18n::Message::PythonNumpyLinalgFunction, false, I18n::Message::PythonCommandNumpyLinalgFunctionWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyDet),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyEig),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyCholesky),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyInv),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyNorm)
-};
-
-const ToolboxMessageTree NumpyModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromNumpy, I18n::Message::PythonImportNumpy, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFunction, I18n::Message::PythonNumpyFunction, false, I18n::Message::PythonCommandNumpyFunctionWithoutArg),
-  ToolboxMessageTree::Node(I18n::Message::NumpyNdarray, NumpyNdarrayModuleChildren),
-  ToolboxMessageTree::Node(I18n::Message::Functions, NumpyFunctionsModuleChildren),
-  ToolboxMessageTree::Node(I18n::Message::NumpyFftModule, NumpyFftModuleChildren),
-  ToolboxMessageTree::Node(I18n::Message::NumpyLinalgModule, NumpyLinalgModuleChildren)
-};
-
-const ToolboxMessageTree ScipyLinalgModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipyLinalgFunction, I18n::Message::PythonScipyLinalgFunction, false, I18n::Message::PythonCommandScipyLinalgFunctionWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipyLinalgChoSolve),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipyLinalgSolveTriangular)
-};
-
-const ToolboxMessageTree ScipyOptimizeModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipyOptimizeFunction, I18n::Message::PythonScipyOptimizeFunction, false, I18n::Message::PythonCommandScipyOptimizeFunctionWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipyOptimizeBisect),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipyOptimizeFmin),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipyOptimizeNewton)
-};
-
-const ToolboxMessageTree ScipySignalModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipySignalFunction, I18n::Message::PythonScipySignalFunction, false, I18n::Message::PythonCommandScipySignalFunctionWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipySignalSosfilt),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipySignalSpectrogram)
-};
-
-const ToolboxMessageTree ScipySpecialModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipySpecialFunction, I18n::Message::PythonScipySpecialFunction, false, I18n::Message::PythonCommandScipySpecialFunctionWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipySpecialErf),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipySpecialErfc),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipySpecialGamma),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipySpecialGammaln),
-};
-
-const ToolboxMessageTree ScipyModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromScipy, I18n::Message::PythonImportScipy, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipyFunction, I18n::Message::PythonScipyFunction, false, I18n::Message::PythonCommandScipyFunctionWithoutArg),
-  ToolboxMessageTree::Node(I18n::Message::ScipyLinalgModule, ScipyLinalgModuleChildren),
-  ToolboxMessageTree::Node(I18n::Message::ScipyOptimizeModule, ScipyOptimizeModuleChildren),
-  ToolboxMessageTree::Node(I18n::Message::ScipySignalModule, ScipySignalModuleChildren),
-  ToolboxMessageTree::Node(I18n::Message::ScipySpecialModule, ScipySpecialModuleChildren),
-};
-
-const ToolboxMessageTree UlabModuleChildren[] = {
-  ToolboxMessageTree::Node(I18n::Message::NumpyModule, NumpyModuleChildren),
-  ToolboxMessageTree::Node(I18n::Message::ScipyModule, ScipyModuleChildren),
-  ToolboxMessageTree::Leaf(I18n::Message::UlabDocumentation, I18n::Message::UlabDocumentationLink)
-};
-
-#endif
-
 const ToolboxMessageTree TurtleModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportTurtle, I18n::Message::PythonImportTurtle, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromTurtle, I18n::Message::PythonImportTurtle, false),
@@ -360,74 +192,88 @@ const ToolboxMessageTree KandinskyModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandSetPixel, I18n::Message::PythonSetPixel),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandColor, I18n::Message::PythonColor),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawString, I18n::Message::PythonDrawString),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawLine, I18n::Message::PythonDrawLine),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawCircle, I18n::Message::PythonDrawCircle),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFillRect, I18n::Message::PythonFillRect),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFillCircle, I18n::Message::PythonFillCircle),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFillPolygon, I18n::Message::PythonFillPolygon),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandGetKeys, I18n::Message::PythonGetKeys),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandGetPalette, I18n::Message::PythonGetPalette)};
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFillRect, I18n::Message::PythonFillRect)
+};
 
 const ToolboxMessageTree IonModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportIon, I18n::Message::PythonImportIon, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromIon, I18n::Message::PythonImportIon, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandIonFunction, I18n::Message::PythonIonFunction, false, I18n::Message::PythonCommandIonFunctionWithoutArg),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandIsKeyDown, I18n::Message::PythonIsKeyDown),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandBattery, I18n::Message::PythonBattery),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandBatteryLevel, I18n::Message::PythonBatteryLevel),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandBatteryIscharging, I18n::Message::PythonBatteryIscharging),
-  ToolboxMessageTree::Leaf(I18n::Message::IonSelector, I18n::Message::IonSelector)
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyLeft, I18n::Message::PythonKeyLeft, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyUp, I18n::Message::PythonKeyUp, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyDown, I18n::Message::PythonKeyDown, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyRight, I18n::Message::PythonKeyRight, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyOk, I18n::Message::PythonKeyOk, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyBack, I18n::Message::PythonKeyBack, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyHome, I18n::Message::PythonKeyHome, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyOnOff, I18n::Message::PythonKeyOnOff, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyShift, I18n::Message::PythonKeyShift, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyAlpha, I18n::Message::PythonKeyAlpha, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyXnt, I18n::Message::PythonKeyXnt, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyVar, I18n::Message::PythonKeyVar, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyToolbox, I18n::Message::PythonKeyToolbox, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyBackspace, I18n::Message::PythonKeyBackspace, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyExp, I18n::Message::PythonKeyExp, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyLn, I18n::Message::PythonKeyLn, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyLog, I18n::Message::PythonKeyLog, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyImaginary, I18n::Message::PythonKeyImaginary, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyComma, I18n::Message::PythonKeyComma, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyPower, I18n::Message::PythonKeyPower, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeySine, I18n::Message::PythonKeySine, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyCosine, I18n::Message::PythonKeyCosine, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyTangent, I18n::Message::PythonKeyTangent, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyPi, I18n::Message::PythonKeyPi, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeySqrt, I18n::Message::PythonKeySqrt, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeySquare, I18n::Message::PythonKeySquare, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeySeven, I18n::Message::PythonKeySeven, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyEight, I18n::Message::PythonKeyEight, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyNine, I18n::Message::PythonKeyNine, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyLeftParenthesis, I18n::Message::PythonKeyLeftParenthesis, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyRightParenthesis, I18n::Message::PythonKeyRightParenthesis, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyFour, I18n::Message::PythonKeyFour, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyFive, I18n::Message::PythonKeyFive, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeySix, I18n::Message::PythonKeySix, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyMultiplication, I18n::Message::PythonKeyMultiplication, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyDivision, I18n::Message::PythonKeyDivision, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyOne, I18n::Message::PythonKeyOne, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyTwo, I18n::Message::PythonKeyTwo, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyThree, I18n::Message::PythonKeyThree, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyPlus, I18n::Message::PythonKeyPlus, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyMinus, I18n::Message::PythonKeyMinus, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyZero, I18n::Message::PythonKeyZero, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyDot, I18n::Message::PythonKeyDot, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyEe, I18n::Message::PythonKeyEe, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyAns, I18n::Message::PythonKeyAns, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyExe, I18n::Message::PythonKeyExe, false)
 };
 
 const ToolboxMessageTree TimeModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportTime, I18n::Message::PythonImportTime, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromTime, I18n::Message::PythonImportTime, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandTimeFunction, I18n::Message::PythonTimeFunction, false, I18n::Message::PythonCommandTimeFunctionWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandTime, I18n::Message::PythonTime),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandMonotonic, I18n::Message::PythonMonotonic, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandSleep, I18n::Message::PythonSleep),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandLocalTime, I18n::Message::PythonLocalTime),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandMktime, I18n::Message::PythonMktime),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandSetLocaltime, I18n::Message::PythonSetLocaltime),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandRTCmode, I18n::Message::PythonRTCmode),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandSetRTCmode, I18n::Message::PythonSetRTCmode),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandSleep, I18n::Message::PythonSleep)
 };
 
 const ToolboxMessageTree OsModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportOs, I18n::Message::PythonImportOs, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromOs, I18n::Message::PythonImportOs, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonOsCommandUname, I18n::Message::PythonOsUname, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonOsCommandGetlogin, I18n::Message::PythonOsGetlogin, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonOsCommandRemove, I18n::Message::PythonOsRemove, false, I18n::Message::PythonOsCommandRemoveWithoutArg),
   ToolboxMessageTree::Leaf(I18n::Message::PythonOsCommandRename, I18n::Message::PythonOsRename, false, I18n::Message::PythonOsCommandRenameWithoutArg),
   ToolboxMessageTree::Leaf(I18n::Message::PythonOsCommandListdir, I18n::Message::PythonOsListdir, false)
 };
 
-const ToolboxMessageTree SysModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportSys, I18n::Message::PythonImportSys, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromSys, I18n::Message::PythonImportSys, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonSysCommandExit, I18n::Message::PythonSysExit, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonSysCommandPrintexception, I18n::Message::PythonSysPrintexception, false, I18n::Message::PythonSysCommandPrintexceptionWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonSysCommandByteorder, I18n::Message::PythonSysByteorder, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonSysCommandImplementation, I18n::Message::PythonSysImplementation, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonSysCommandModules, I18n::Message::PythonSysModules, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonSysCommandVersion, I18n::Message::PythonSysVersion, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonSysCommandVersioninfo, I18n::Message::PythonSysVersioninfo, false)
-};
-
 const ToolboxMessageTree modulesChildren[] = {
   ToolboxMessageTree::Node(I18n::Message::MathModule, MathModuleChildren),
   ToolboxMessageTree::Node(I18n::Message::CmathModule, CMathModuleChildren),
   ToolboxMessageTree::Node(I18n::Message::MatplotlibPyplotModule, MatplotlibPyplotModuleChildren),
-#if defined(INCLUDE_ULAB)
-  ToolboxMessageTree::Node(I18n::Message::UlabModule, UlabModuleChildren),
-#endif
   ToolboxMessageTree::Node(I18n::Message::TurtleModule, TurtleModuleChildren),
   ToolboxMessageTree::Node(I18n::Message::RandomModule, RandomModuleChildren),
   ToolboxMessageTree::Node(I18n::Message::KandinskyModule, KandinskyModuleChildren),
   ToolboxMessageTree::Node(I18n::Message::IonModule, IonModuleChildren),
   ToolboxMessageTree::Node(I18n::Message::OsModule, OsModuleChildren),
-  ToolboxMessageTree::Node(I18n::Message::SysModule, SysModuleChildren),
   ToolboxMessageTree::Node(I18n::Message::TimeModule, TimeModuleChildren)
 };
 
@@ -469,8 +315,6 @@ const ToolboxMessageTree catalogChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandCosh, I18n::Message::PythonCosh),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDegrees, I18n::Message::PythonDegrees),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDivMod, I18n::Message::PythonDivMod),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawCircle, I18n::Message::PythonDrawCircle),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawLine, I18n::Message::PythonDrawLine),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawString, I18n::Message::PythonDrawString),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandConstantE, I18n::Message::PythonConstantE, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandErf, I18n::Message::PythonErf),
@@ -479,8 +323,6 @@ const ToolboxMessageTree catalogChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandExp, I18n::Message::PythonExp),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandExpm1, I18n::Message::PythonExpm1),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFabs, I18n::Message::PythonFabs),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFillCircle, I18n::Message::PythonFillCircle),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFillPolygon, I18n::Message::PythonFillPolygon),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFillRect, I18n::Message::PythonFillRect),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFloat, I18n::Message::PythonFloat),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFloor, I18n::Message::PythonFloor),
@@ -523,7 +365,6 @@ const ToolboxMessageTree catalogChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandIsNaN, I18n::Message::PythonIsNaN),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKandinskyFunction, I18n::Message::PythonKandinskyFunction, false, I18n::Message::PythonCommandKandinskyFunctionWithoutArg),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandIsKeyDown, I18n::Message::PythonIsKeyDown),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandBattery, I18n::Message::PythonBattery),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandLdexp, I18n::Message::PythonLdexp),
   ToolboxMessageTree::Leaf(I18n::Message::PythonTurtleCommandLeft, I18n::Message::PythonTurtleLeft),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandLength, I18n::Message::PythonLength),
@@ -693,18 +534,8 @@ KDCoordinate PythonToolbox::rowHeight(int j) {
 }
 
 bool PythonToolbox::selectLeaf(int selectedRow) {
-  ToolboxMessageTree * node = (ToolboxMessageTree *)m_messageTreeModel->childAtIndex(selectedRow);
-#if defined(INCLUDE_ULAB)
-  if(node->text() == I18n::Message::UlabDocumentationLink){
-    return true;
-  }
-#endif
   m_selectableTableView.deselectTable();
-  if(node->insertedText() == I18n::Message::IonSelector){
-    m_ionKeys.setSender(sender());
-    Container::activeApp()->displayModalViewController(static_cast<ViewController*>(&m_ionKeys), 0.f, 0.f, Metric::PopUpTopMargin, Metric::PopUpLeftMargin, 0, Metric::PopUpRightMargin);
-    return true;
-  }
+  ToolboxMessageTree * node = (ToolboxMessageTree *)m_messageTreeModel->childAtIndex(selectedRow);
   const char * editedText = I18n::translate(node->insertedText());
   // strippedEditedText array needs to be in the same scope as editedText
   char strippedEditedText[k_maxMessageSize];

apps/code/python_toolbox.h

@@ -5,7 +5,6 @@
 #include <escher.h>
 #include <ion/events.h>
 #include <kandinsky/font.h>
-#include "toolbox_ion_keys.h"
 
 namespace Code {
 
@@ -33,7 +32,6 @@ private:
   void scrollToAndSelectChild(int i);
   MessageTableCellWithMessage m_leafCells[k_maxNumberOfDisplayedRows];
   MessageTableCellWithChevron m_nodeCells[k_maxNumberOfDisplayedRows];
-  toolboxIonKeys m_ionKeys;
 };
 
 }

apps/code/script_node_cell.cpp

@@ -21,10 +21,10 @@ void ScriptNodeCell::ScriptNodeView::drawRect(KDContext * ctx, KDRect rect) cons
   const int nodeNameLength = m_scriptNode->nameLength();
   KDSize nameSize = k_font->stringSize(nodeName, nodeNameLength);
   const KDCoordinate nodeNameY = k_topMargin;
-  ctx->drawString(nodeName, KDPoint(0, nodeNameY), k_font, Palette::PrimaryText, backgroundColor, nodeNameLength);
+  ctx->drawString(nodeName, KDPoint(0, nodeNameY), k_font, KDColorBlack, backgroundColor, nodeNameLength);
   // If it is needed, draw the parentheses
   if (m_scriptNode->type() == ScriptNode::Type::WithParentheses) {
-    ctx->drawString(ScriptNodeCell::k_parentheses, KDPoint(nameSize.width(), nodeNameY), k_font, Palette::PrimaryText, backgroundColor);
+    ctx->drawString(ScriptNodeCell::k_parentheses, KDPoint(nameSize.width(), nodeNameY), k_font, KDColorBlack, backgroundColor);
   }
 
   /* If it exists, draw the source name. If it did not fit, we would have put

apps/code/script_store.cpp

@@ -8,9 +8,11 @@ bool ScriptStore::ScriptNameIsFree(const char * baseName) {
   return ScriptBaseNamed(baseName).isNull();
 }
 
-// Here we add "base" script
 ScriptStore::ScriptStore() {
-  
+  addScriptFromTemplate(ScriptTemplate::Squares());
+  addScriptFromTemplate(ScriptTemplate::Parabola());
+  addScriptFromTemplate(ScriptTemplate::Mandelbrot());
+  addScriptFromTemplate(ScriptTemplate::Polynomial());
 }
 
 void ScriptStore::deleteAllScripts() {

apps/code/script_template.cpp

@@ -5,9 +5,103 @@ namespace Code {
 constexpr ScriptTemplate emptyScriptTemplate(".py", "\x01" R"(from math import *
 )");
 
+constexpr ScriptTemplate squaresScriptTemplate("squares.py", "\x01" R"(from math import *
+from turtle import *
+def squares(angle=0.5):
+  reset()
+  L=330
+  speed(10)
+  penup()
+  goto(-L/2,-L/2)
+  pendown()
+  for i in range(660):
+    forward(L)
+    left(90+angle)
+    L=L-L*sin(angle*pi/180)
+  hideturtle())");
+
+constexpr ScriptTemplate mandelbrotScriptTemplate("mandelbrot.py", "\x01" R"(# This script draws a Mandelbrot fractal set
+# N_iteration: degree of precision
+import kandinsky
+def mandelbrot(N_iteration):
+  for x in range(320):
+    for y in range(222):
+# Compute the mandelbrot sequence for the point c = (c_r, c_i) with start value z = (z_r, z_i)
+      z = complex(0,0)
+# Rescale to fit the drawing screen 320x222
+      c = complex(3.5*x/319-2.5, -2.5*y/221+1.25)
+      i = 0
+      while (i < N_iteration) and abs(z) < 2:
+        i = i + 1
+        z = z*z+c
+# Choose the color of the dot from the Mandelbrot sequence
+      rgb = int(255*i/N_iteration)
+      col = kandinsky.color(int(rgb*0.82),int(rgb*0.13),int(rgb*0.18))
+# Draw a pixel colored in 'col' at position (x,y)
+      kandinsky.set_pixel(x,y,col))");
+
+constexpr ScriptTemplate polynomialScriptTemplate("polynomial.py", "\x01" R"(from math import *
+# roots(a,b,c) computes the solutions of the equation a*x**2+b*x+c=0
+def roots(a,b,c):
+  delta = b*b-4*a*c
+  if delta == 0:
+    return -b/(2*a)
+  elif delta > 0:
+    x_1 = (-b-sqrt(delta))/(2*a)
+    x_2 = (-b+sqrt(delta))/(2*a)
+    return x_1, x_2
+  else:
+    return None)");
+
+constexpr ScriptTemplate parabolaScriptTemplate("parabola.py", "\x01" R"(from matplotlib.pyplot import *
+from math import *
+
+g=9.81
+
+def x(t,v_0,alpha):
+  return v_0*cos(alpha)*t
+def y(t,v_0,alpha,h_0):
+  return -0.5*g*t**2+v_0*sin(alpha)*t+h_0
+
+def vx(v_0,alpha):
+  return v_0*cos(alpha)
+def vy(t,v_0,alpha):
+  return -g*t+v_0*sin(alpha)
+
+def t_max(v_0,alpha,h_0):
+  return (v_0*sin(alpha)+sqrt((v_0**2)*(sin(alpha)**2)+2*g*h_0))/g
+
+def simulation(v_0=15,alpha=pi/4,h_0=2):
+  tMax=t_max(v_0,alpha,h_0)
+  accuracy=1/10**(floor(log10(tMax))-1)
+  T_MAX=floor(tMax*accuracy)+1
+  X=[x(t/accuracy,v_0,alpha) for t in range(T_MAX)]
+  Y=[y(t/accuracy,v_0,alpha,h_0) for t in range(T_MAX)]
+  VX=[vx(v_0,alpha) for t in range(T_MAX)]
+  VY=[vy(t/accuracy,v_0,alpha) for t in range(T_MAX)]
+  for i in range(T_MAX):
+    arrow(X[i],Y[i],VX[i]/accuracy,VY[i]/accuracy)
+  grid()
+  show())");
 
 const ScriptTemplate * ScriptTemplate::Empty() {
   return &emptyScriptTemplate;
 }
 
+const ScriptTemplate * ScriptTemplate::Squares() {
+  return &squaresScriptTemplate;
+}
+
+const ScriptTemplate * ScriptTemplate::Mandelbrot() {
+  return &mandelbrotScriptTemplate;
+}
+
+const ScriptTemplate * ScriptTemplate::Polynomial() {
+  return &polynomialScriptTemplate;
+}
+
+const ScriptTemplate * ScriptTemplate::Parabola() {
+  return &parabolaScriptTemplate;
+}
+
 }

apps/code/script_template.h

@@ -9,6 +9,10 @@ class ScriptTemplate {
 public:
   constexpr ScriptTemplate(const char * name, const char * value) : m_name(name), m_value(value) {}
   static const ScriptTemplate * Empty();
+  static const ScriptTemplate * Squares();
+  static const ScriptTemplate * Mandelbrot();
+  static const ScriptTemplate * Polynomial();
+  static const ScriptTemplate * Parabola();
   const char * name() const { return m_name; }
   const char * content() const { return m_value + Script::StatusSize(); }
   const char * value() const { return m_value; }

apps/code/test/toolbox_ion_keys_dummy.cpp

@@ -1,27 +0,0 @@
-#include "../toolbox_ion_keys.h"
-
-namespace Code {
-  toolboxIonKeys::toolboxIonKeys() :
-  ViewController(nullptr),
-  m_view()
-  {
-  }
-
-  bool toolboxIonKeys::handleEvent(Ion::Events::Event e) {
-    return false;
-  }
-
-  toolboxIonKeys::toolboxIonView::toolboxIonView():
-    View()
-    {
-    }
-
-  void toolboxIonKeys::toolboxIonView::drawRect(KDContext * ctx, KDRect rect) const {
-    return;
-  }
-
-  View * toolboxIonKeys::view(){
-    return &m_view;
-  }
-
-}

apps/code/toolbox.de.i18n

@@ -4,4 +4,3 @@ Modules = "Module"
 LoopsAndTests = "Schleifen und Tests"
 Files = "Dateien"
 Exceptions = "Ausnahmen"
-UlabDocumentation = "Dokumentation"

apps/code/toolbox.en.i18n

@@ -4,4 +4,3 @@ Modules = "Modules"
 LoopsAndTests = "Loops and tests"
 Files = "Files"
 Exceptions = "Exceptions"
-UlabDocumentation = "Documentation"

apps/code/toolbox.es.i18n

@@ -4,4 +4,3 @@ Modules = "Modules"
 LoopsAndTests = "Loops and tests"
 Files = "Files"
 Exceptions = "Exceptions"
-UlabDocumentation = "Documentación"

apps/code/toolbox.fr.i18n

@@ -4,4 +4,3 @@ Modules = "Modules"
 LoopsAndTests = "Boucles et tests"
 Files = "Fichiers"
 Exceptions = "Exceptions"
-UlabDocumentation = "Documentation"

apps/code/toolbox.hu.i18n

@@ -4,4 +4,3 @@ Modules = "Modulok"
 LoopsAndTests = "Hurkok és tesztek"
 Files = "Fájlok"
 Exceptions = "Kivételek"
-UlabDocumentation = "Dokumentáció"

apps/code/toolbox.it.i18n

@@ -4,4 +4,3 @@ Modules = "Moduli"
 LoopsAndTests = "Cicli e test"
 Files = "Files"
 Exceptions = "Exceptions"
-UlabDocumentation = "Documentazione"

apps/code/toolbox.nl.i18n

@@ -4,4 +4,3 @@ Modules = "Modules"
 LoopsAndTests = "Herhalingen en testen"
 Files = "Files"
 Exceptions = "Exceptions"
-UlabDocumentation = "Documentatie"

apps/code/toolbox.pt.i18n

@@ -4,4 +4,3 @@ Modules = "Módulos"
 LoopsAndTests = "Laços e testes"
 Files = "Files"
 Exceptions = "Exceptions"
-UlabDocumentation = "Documentação"

apps/code/toolbox.universal.i18n

@@ -3,20 +3,9 @@ IonModule = "ion"
 KandinskyModule = "kandinsky"
 MathModule = "math"
 MatplotlibPyplotModule = "matplotlib.pyplot"
-NumpyModule = "numpy"
-NumpyFftModule = "fft"
-NumpyLinalgModule = "linalg"
-ScipyModule = "scipy"
-ScipyLinalgModule = "linalg"
-ScipyOptimizeModule = "optimize"
-ScipySignalModule = "signal"
-ScipySpecialModule = "special"
-NumpyNdarray = "ndarray"
 OsModule = "os"
-SysModule = "sys"
 TimeModule = "time"
 TurtleModule = "turtle"
-UlabModule = "ulab"
 ForLoopMenu = "For"
 IfStatementMenu = "If"
 WhileLoopMenu = "While"
@@ -68,6 +57,3 @@ PythonCommandDef = "def \x11():\n  "
 PythonCommandDefWithArg = "def function(x):"
 PythonCommandReturn = "return "
 RandomModule = "random"
-IonSelector = "Key selector"
-PressAKey = "Press a key"
-UlabDocumentationLink = "micropython-ulab.readthedocs.io"

apps/code/toolbox_ion_keys.cpp

@@ -1,50 +0,0 @@
-#include "toolbox_ion_keys.h"
-#include <apps/apps_container.h>
-#include <assert.h>
-#include <ion.h>
-extern "C" {
-#include <py/obj.h>
-#include <py/objfun.h>
-}
-extern const mp_rom_map_elem_t modion_module_globals_table[48];
-
-namespace Code {
-  toolboxIonKeys::toolboxIonKeys() :
-  ViewController(nullptr),
-  m_view()
-  {
-  }
-
-  bool toolboxIonKeys::handleEvent(Ion::Events::Event e) {
-    Ion::Keyboard::State state = Ion::Keyboard::scan();
-    for(uint16_t i = 0; i < sizeof(modion_module_globals_table)/sizeof(_mp_rom_map_elem_t); i++){
-      _mp_rom_map_elem_t element = modion_module_globals_table[i];
-      if(mp_obj_is_small_int(element.value)){
-        int key = mp_obj_get_int(element.value);
-        if(state.keyDown(static_cast<Ion::Keyboard::Key>(key))){
-          m_sender->handleEventWithText(qstr_str(MP_OBJ_QSTR_VALUE(element.key)), true);
-        }
-      }
-    }
-    Container::activeApp()->dismissModalViewController();
-    AppsContainer::sharedAppsContainer()->redrawWindow();
-    return true;
-  }
-
-  toolboxIonKeys::toolboxIonView::toolboxIonView():
-    View()
-    {
-    }
-
-  void toolboxIonKeys::toolboxIonView::drawRect(KDContext * ctx, KDRect rect) const {
-    ctx->fillRect(rect, Palette::WallScreen);
-    ctx->strokeRect(rect, Palette::ListCellBorder);
-    ctx->drawString(I18n::translate(I18n::Message::PressAKey),KDPoint(rect.left()+80, rect.top()+20),KDFont::LargeFont,Palette::PrimaryText,Palette::WallScreen);
-  
-  }
-
-  View * toolboxIonKeys::view(){
-    return &m_view;
-  }
-
-}

apps/code/toolbox_ion_keys.h

@@ -1,21 +0,0 @@
-#include <escher.h>
-
-namespace Code {
-
-  class toolboxIonKeys : public ViewController {
-    public :
-      toolboxIonKeys();
-      View * view() override;
-      bool handleEvent(Ion::Events::Event e) override;
-      void setSender(InputEventHandler * sender) { m_sender = sender; }
-    private :
-      class toolboxIonView : public View {
-        public :
-          toolboxIonView();
-          void drawRect(KDContext * ctx, KDRect rect) const override;
-      };
-      toolboxIonView m_view;
-      InputEventHandler * m_sender;
-  };
-
-}

apps/code/variable_box_controller.h

@@ -43,9 +43,9 @@ public:
 
 private:
   constexpr static size_t k_maxNumberOfDisplayedItems = (Ion::Display::Height - Metric::TitleBarHeight - Metric::PopUpTopMargin) / ScriptNodeCell::k_simpleItemHeight + 2; // +2 if the cells are cropped on top and at the bottom
-  constexpr static size_t k_maxScriptNodesCount = 64; // Chosen without particular reasons (Number of functions in the variables box)
+  constexpr static size_t k_maxScriptNodesCount = 32; // Chosen without particular reasons
   constexpr static int k_totalBuiltinNodesCount = 107;
-  constexpr static uint8_t k_scriptOriginsCount = 8; // Number of scripts loaded in the variable box
+  constexpr static uint8_t k_scriptOriginsCount = 3;
   constexpr static uint8_t k_subtitleCellType = NodeCellType; // We don't care as it is not selectable
   constexpr static uint8_t k_itemCellType = LeafCellType; // So that upper class NestedMenuController knows it's a leaf
   constexpr static KDCoordinate k_subtitleRowHeight = 23;

apps/external/archive.cpp

@@ -55,43 +55,29 @@ bool fileAtIndex(size_t index, File &entry) {
    * TAR files are comprised of a set of records aligned to 512 bytes boundary
    * followed by data.
    */
-  
-  for(;;) {
-    // Calculate the size
+  while (index-- > 0) {
     size = 0;
     for (int i = 0; i < 11; i++)
       size = size * 8 + (tar->size[i] - '0');
-    
-    // Check if we found our file.
-    if (index == 0) {
-      // If yes, check for sanity and for exam mode stuff
-      if (!isSane(tar) || isExamModeAndFileNotExecutable(tar)) {
-        return false;
-      }
 
-      // File entry found, copy data out.
-      entry.name = tar->name;
-      entry.data = reinterpret_cast<const uint8_t*>(tar) + sizeof(TarHeader);
-      entry.dataLength = size;
-      entry.isExecutable = (tar->mode[4] & 0x01) == 1;
+    // Move to the next TAR header.
+    unsigned stride = (sizeof(TarHeader) + size + 511);
+    stride = (stride >> 9) << 9;
+    tar = reinterpret_cast<const TarHeader*>(reinterpret_cast<const char*>(tar) + stride);
 
-      return true;
-    } else {
-      // move to the next TAR header.
-      unsigned stride = (sizeof(TarHeader) + size + 511);
-      stride = (stride >> 9) << 9;
-      tar = reinterpret_cast<const TarHeader*>(reinterpret_cast<const char*>(tar) + stride);
-
-      // Sanity check.
-      if (!isSane(tar)) {
-        return false;
-      }
+    // Sanity check.
+    if (!isSane(tar) || isExamModeAndFileNotExecutable(tar)) {
+      return false;
     }
-    index--;
   }
-  
-  // Achievement unlock: How did we get there ?
-  return false;
+
+  // File entry found, copy data out.
+  entry.name = tar->name;
+  entry.data = reinterpret_cast<const uint8_t*>(tar) + sizeof(TarHeader);
+  entry.dataLength = size;
+  entry.isExecutable = (tar->mode[4] & 0x01) == 1;
+
+  return true;
 }
 
 extern "C" void (* const apiPointers[])(void);

apps/external/base.de.i18n

@@ -1,9 +1,9 @@
 ExternalApp = "External"
 ExternalAppCapital = "EXTERNAL"
-ExternalAppApiMismatch = "API stimmt nicht überein"
-ExternalAppExecError = "Datei kann nicht ausgeführt werden"
-ExternalNotCompatible = "Externe App ist nicht kompatibel"
+ExternalAppApiMismatch = "API mismatch"
+ExternalAppExecError = "Cannot execute file"
+ExternalNotCompatible = "External ist nicht kompatibel"
 WithSimulator = "mit dem Simulator"
-WithN0100 = "mit N0100"
-GetMoreAppsAt = "Weitere Apps abrufen bei"
-NoAppsInstalled = "Keine Apps installiert"
+WithN0100 = "mit n0100"
+GetMoreAppsAt = "Weitere Apps erhalten Sie auf"
+NoAppsInstalled = "Keine Apps installiert"

apps/external/base.fr.i18n

@@ -1,7 +1,7 @@
 ExternalApp = "External"
 ExternalAppCapital = "EXTERNAL"
-ExternalAppApiMismatch = "Décalage API"
-ExternalAppExecError = "Le fichier ne peut pas être exécuté"
+ExternalAppApiMismatch = "API mismatch"
+ExternalAppExecError = "Cannot execute file"
 ExternalNotCompatible = "External n'est pas compatible"
 WithSimulator = "avec le simulateur"
 WithN0100 = "avec n0100"

apps/external/base.hu.i18n

@@ -1,9 +1,9 @@
 ExternalApp = "Külsö"
-ExternalAppCapital = "KÜLSÖ"
+ExternalAppCapital = "KÜLSö"
 ExternalAppApiMismatch = "API eltérés"
 ExternalAppExecError = "A fájl nem futtatható"
-ExternalNotCompatible = "Externál nem kompatibilis"
+ExternalNotCompatible = "Ez az alkalmazás nem kompatibilis a "
 WithSimulator = "Szimulátorral"
-WithN0100 = "n0100-al"
-GetMoreAppsAt = "Mégtöbb alkalmazás itt :"
-NoAppsInstalled = "Nincs letöltött externál"
+WithN0100 = "a n0100-el"
+GetMoreAppsAt = "Mégtöbb alkalmazás a"
+NoAppsInstalled = "Nincs letöltött alkalmazás"

apps/geometry/Makefile

@@ -1,23 +0,0 @@
-apps += Geometry::App
-app_headers += apps/geometry/app.h
-
-app_geometry_src = $(addprefix apps/geometry/,\
-  app.cpp \
-  list/figures_controller.cpp \
-  list/definition_type_controller.cpp \
-  list/figure_type_controller.cpp \
-  list/figure_parameters_controller.cpp \
-  list/objects_controller.cpp \
-  list/message_table_cell_with_selector.cpp \
-  figure_store.cpp \
-  graph/graph_controller.cpp \
-  graph/banner_view.cpp \
-)
-
-apps_src += $(app_geometry_src)
-
-app_images += apps/geometry/geometry_icon.png
-
-i18n_files += $(call i18n_with_universal_for,geometry/base)
-
-$(eval $(call depends_on_image,apps/geometry/app.cpp,apps/geometry/geometry_icon.png))

apps/geometry/app.cpp

@@ -1,48 +0,0 @@
-#include "app.h"
-#include "geometry_icon.h"
-#include "apps/apps_container.h"
-#include "apps/i18n.h"
-
-namespace Geometry 
-{
-
-I18n::Message App::Descriptor::name() 
-{
-  return I18n::Message::GeometryApp;
-}
-
-I18n::Message App::Descriptor::upperName() 
-{
-  return I18n::Message::GeometryAppCapital;
-}
-
-const Image * App::Descriptor::icon() 
-{
-  return ImageStore::GeometryIcon;
-}
-
-App * App::Snapshot::unpack(Container * container) 
-{
-  return new (container->currentAppBuffer()) App(this);
-}
-
-App::Descriptor * App::Snapshot::descriptor()
-{
-  static Descriptor descriptor;
-  return &descriptor;
-}
-
-App::App(Snapshot * snapshot) :
-  TextFieldDelegateApp(snapshot, &m_tabViewController),
-  m_figuresController(&m_stackViewController),
-  m_stackViewController(&m_tabViewController, &m_figuresController),
-  m_graphController(&m_graphAlternateEmptyViewController, this, &m_graphHeader, nullptr, nullptr, nullptr),
-  m_graphAlternateEmptyViewController(&m_graphHeader, &m_graphController, &m_graphController),
-  m_graphHeader(&m_graphStackViewController, &m_graphAlternateEmptyViewController, &m_graphController),
-  m_graphStackViewController(&m_tabViewController, &m_graphHeader),
-  m_otherViewController(&m_tabViewController),
-  m_tabViewController(&m_modalViewController, snapshot, &m_stackViewController, &m_graphAlternateEmptyViewController, &m_otherViewController)
-{
-}
-
-}

apps/geometry/app.h

@@ -1,40 +0,0 @@
-#ifndef GEOMETRY_H
-#define GEOMETRY_H
-
-#include <escher.h>
-#include "list/figures_controller.h"
-#include "graph/graph_controller.h"
-#include "other/other_view_controller.h"
-#include "../shared/text_field_delegate_app.h"
-
-namespace Geometry {
-
-class App : public Shared::TextFieldDelegateApp {
-public:
-  class Descriptor : public ::App::Descriptor {
-  public:
-    I18n::Message name() override;
-    I18n::Message upperName() override;
-    const Image * icon() override;
-  };
-  class Snapshot : public ::App::Snapshot, public TabViewDataSource {
-  public:
-    App * unpack(Container * container) override;
-    Descriptor * descriptor() override;
-  };
-private:
-  App(Snapshot * snapshot);
-
-  FiguresController m_figuresController;
-  StackViewController m_stackViewController;
-  GraphController m_graphController;
-  AlternateEmptyViewController m_graphAlternateEmptyViewController;
-  StackViewController m_graphStackViewController;
-  ButtonRowController m_graphHeader;
-  OtherViewController m_otherViewController;
-  TabViewController m_tabViewController;
-};
-
-}
-
-#endif

apps/geometry/base.de.i18n

@@ -1,6 +0,0 @@
-GeometryApp = "Geometry"
-GeometryAppCapital = "GEOMETRY"
-AddFigure = "Ajouter une figure"
-FigureType = "Type de figure"
-DefinitionType = "Définition de la figure"
-ParametersChoice = "Choix des paramètres"

apps/geometry/base.en.i18n

@@ -1,6 +0,0 @@
-GeometryApp = "Geometry"
-GeometryAppCapital = "GEOMETRY"
-AddFigure = "Ajouter une figure"
-FigureType = "Type de figure"
-DefinitionType = "Définition de la figure"
-ParametersChoice = "Choix des paramètres"

apps/geometry/base.es.i18n

@@ -1,6 +0,0 @@
-GeometryApp = "Geometry"
-GeometryAppCapital = "GEOMETRY"
-AddFigure = "Ajouter une figure"
-FigureType = "Type de figure"
-DefinitionType = "Définition de la figure"
-ParametersChoice = "Choix des paramètres"

apps/geometry/base.fr.i18n

@@ -1,6 +0,0 @@
-GeometryApp = "Geometry"
-GeometryAppCapital = "GEOMETRY"
-AddFigure = "Ajouter une figure"
-FigureType = "Type de figure"
-DefinitionType = "Définition de la figure"
-ParametersChoice = "Choix des paramètres"

apps/geometry/base.hu.i18n

@@ -1,6 +0,0 @@
-GeometryApp = "Geometry"
-GeometryAppCapital = "GEOMETRY"
-AddFigure = "Ajouter une figure"
-FigureType = "Type de figure"
-DefinitionType = "Définition de la figure"
-ParametersChoice = "Choix des paramètres"

apps/geometry/base.it.i18n

@@ -1,6 +0,0 @@
-GeometryApp = "Geometry"
-GeometryAppCapital = "GEOMETRY"
-AddFigure = "Ajouter une figure"
-FigureType = "Type de figure"
-DefinitionType = "Définition de la figure"
-ParametersChoice = "Choix des paramètres"

apps/geometry/base.nl.i18n

@@ -1,6 +0,0 @@
-GeometryApp = "Geometry"
-GeometryAppCapital = "GEOMETRY"
-AddFigure = "Ajouter une figure"
-FigureType = "Type de figure"
-DefinitionType = "Définition de la figure"
-ParametersChoice = "Choix des paramètres"

apps/geometry/base.pt.i18n

@@ -1,6 +0,0 @@
-GeometryApp = "Geometry"
-GeometryAppCapital = "GEOMETRY"
-AddFigure = "Ajouter une figure"
-FigureType = "Type de figure"
-DefinitionType = "Définition de la figure"
-ParametersChoice = "Choix des paramètres"

apps/geometry/base.universal.i18n

@@ -1,24 +0,0 @@
-FiguresTab = "Figures"
-NoFigures = "Aucune figure à afficher"
-OtherTab = "TODO"
-Coordinates = "Coordonnées"
-Middle = "Milieu"
-VectorProject = "Projeté vectoriel"
-OrthogonalProject = "Projeté orthogonal"
-CartesianEquation = "Equation cartésienne"
-LinearEquation = "Equation linéaire"
-Points = "Points"
-PointAndVector = "Point et vecteur"
-Parallele = "Parallèle"
-Perpendicular = "Perpendiculaire"
-PointAndRadius = "Point et rayon"
-Diameter = "Diamètre"
-TwoPoints = "Deux points"
-Segment = "Segment"
-Angle = "Angle"
-Area = "Surface"
-Point = "Point"
-Line = "Droite"
-Circle = "Cercle"
-Vector = "Vecteur"
-Indicator = "Indicateur"

apps/geometry/figure_store.cpp

@@ -1 +0,0 @@
-#include "figure_store.h"

apps/geometry/figure_store.h

@@ -1,14 +0,0 @@
-#ifndef FIGURE__STORE__H
-#define FIGURE__STORE__H
-
-#include "../shared/expression_model_store.h"
-
-namespace Geometry {
-
-class FigureStore: Shared::ExpressionModelStore {
-    
-};
-
-}
-
-#endif

apps/geometry/figures/figure.h

@@ -1,27 +0,0 @@
-#ifndef POINCARE_FIGURE_H
-#define POINCARE_FIGURE_H
-
-#include "figure_type.h"
-
-using namespace Poincare;
-
-namespace Geometry {
-
-class FigureNode : public TreeNode {
-public:
-  virtual size_t size() const override = 0;
-
-  virtual int numberOfChildren() const override { return 0; }
-
-  virtual FigureType type() const = 0;
-  virtual FigureDefinitionType definitionType() const = 0;
-};
-
-class Figure : public TreeHandle {
-public:
-  Figure(const FigureNode * node) : TreeHandle(node) {}
-};
-
-}
-
-#endif

apps/geometry/figures/figure_type.h

@@ -1,24 +0,0 @@
-#ifndef GEOMETRY_FIGURE_TYPE_H
-#define GEOMETRY_FIGURE_TYPE_H
-
-namespace Geometry {
-
-enum class FigureType {
-    None = 0, // Used to trigger assert in debug mode
-    Expression, // It's not a real figure type but we use it to build figures like points
-
-    Point,
-
-    Line,
-    Circle,
-    Vector,
-    Indicator
-};
-
-enum class FigureDefinitionType {
-    PointByCoordinates
-};
-
-}
-
-#endif

apps/geometry/figures/figures.h

@@ -1,6 +0,0 @@
-#ifndef FIGURES_H
-#define FIGURES_H
-
-#include "point_by_coordinates.h"
-
-#endif

apps/geometry/figures/point.cpp

@@ -1 +0,0 @@
-#include "point.h"

apps/geometry/figures/point.h

@@ -1,18 +0,0 @@
-#ifndef GEOMETRY_POINT_H
-#define GEOMETRY_POINT_H
-
-#include "figure.h"
-namespace Geometry {
-
-class PointNode : public FigureNode {
-  virtual FigureType type() const override { return FigureType::Point; }
-};
-
-class Point : public Figure {
-public:
-  Point(const PointNode * n) : Figure(n) {}
-};
-
-}
-
-#endif

apps/geometry/figures/point_by_coordinates.h

@@ -1,31 +0,0 @@
-#ifndef POINT_BY_COORDINATES_H
-#define POINT_BY_COORDINATES_H
-
-#include <poincare/expression.h>
-#include "point.h"
-
-namespace Geometry {
-
-class PointByCoordinatesNode : public PointNode {
-public:
-  virtual size_t size() const override { return sizeof(PointByCoordinatesNode); }
-  virtual int numberOfChildren() const override { return 2; }
-  virtual FigureDefinitionType definitionType() const override { return FigureDefinitionType::PointByCoordinates; }
-#if POINCARE_TREE_LOG
-  void logNodeName(std::ostream & stream) const override {
-    stream << "PointByCoordinates";
-  }
-#endif
-};
-
-class PointByCoordinates : public Figure {
-public:
-  PointByCoordinates(const PointByCoordinatesNode * n) : Figure(n) {}
-  static PointByCoordinates Builder(Expression x, Expression y) { return TreeHandle::FixedArityBuilder<PointByCoordinates, PointByCoordinatesNode>({x, x}); }
-  static int numberOfParameters() { return 2; }
-  static FigureType parameterTypeAtIndex(int i) { return FigureType::Expression; }
-};
-
-}
-
-#endif