feat(ingles): class 07

Areas/optimizing/dev.md

@@ -1,12 +1,12 @@
 # Roadblocks
 
-## ~~ Nested tmux sessions ~~
+## ~~Nested tmux sessions~~
 
 Adding this:
 
 ```yaml
-  RequestTTY true
+RequestTTY true
-  RemoteCommand tmux new -A -s ssh
+RemoteCommand tmux new -A -s ssh
 ```
 to the ssh config if the specific hosts will automatically start tmux when connected
 
@@ -15,17 +15,18 @@ If i ssh into a remote machine with tmux started as well I have some problems:
   - ~~Shortcuts don't work in remote~~
     - This works by hitting the prefix key twice, e.g. ctrl-a-a
 
-## ~~ Debian Gnome sometimes comma key doesn't work ~~
+## ~~Debian Gnome sometimes comma key doesn't work~~
 Has not happened in a while
 
-## ~~ Neovim shortcut to comment out ~~
+## ~~Neovim shortcut to comment out~~
 Fixed this by installing the NerdCommenter Plugin
+Switched to nvim-comment as it seems a bit lighter
 
-##  ~~ Neovim Auto fix problems shortcut + hover window ~~
+##  ~~Neovim Auto fix problems shortcut + hover window~~
 
-## ~~ Better git merging in Neovim, like in VScode ~~
+## ~~Better git merging in Neovim, like in VScode~~
 
-## ~~ Copying between neovim, tmux and ssh sessions does not work ~~
+## ~~Copying between neovim, tmux and ssh sessions does not work~~
 
 ## Learn how to use splits and buffers in neovim
 

Areas/spanish/adjetivos.md

@@ -9,4 +9,4 @@ conjelada - gefroren
 frio - kalt
 calido - warm
 caliente - heiß
-contento - zufrieden
+contento - zufrieden

Areas/spanish/index.md

@@ -1,7 +1,11 @@
 # Learning Spanish
 
-## El Saludo
+[El Clima / La tiempa](./clima.md)
+[Frases](./frases.md)
+[Tiempo](./tiempo.md)
+[Numeros](./numeros)
+[Orientar](./orientar)
 
-Buenas Dias
+[Verbos](./verbos.md)
-Buenas Tardes
+[Adjetivos](./adjetivos)
-Buenas Noches
+[Palabras](./palabras.md)

Areas/spanish/numeros.md

@@ -18,3 +18,39 @@ type: dictionary
 
 12 - doce
 13 - treces
+14 - catorce
+15 - quince
+16 - diecisies
+17 - diecisiete
+18 - dieciocho
+19 - diecinueve
+
+20 - veinte
+30 - treinte
+33 - treinta y tres
+40 - cuarenta
+50 - cincuenta
+60 - sesenta
+70 - setenta
+80 - ochenta
+90 - noventa
+100 - ciento
+
+153 - ciento cincuenta y tres
+200 - doscientos
+300 - trescientos
+400 - cuatrocientos
+500 - quinientos
+600 - sesientos
+700 - setientos
+800 - ochocientos
+900 - novecientos
+
+1000 - mil
+2000 - dos mil
+3000 - tres mil
+
+1.000.000 - millones
+2.000.000 - dos millones
+
+1.234.567 - un millon doscientes trienta y cuatro mil cinco ciento sesenta y siete

Areas/spanish/orientar.md

@@ -2,7 +2,8 @@
 [Explanation](https://www.spanishdict.com/guide/quick-tips-for-understanding-por-and-para)
 
 alli - dort
-### ejemplo
+
+**ejemplo**
 Es alli - es ist dort
 
 

Areas/spanish/palabras.md

@@ -10,20 +10,20 @@ tampoco - ebensowenig
 mientras - während
 
 ## El Saludo
-El						- Die
+El			- Die
-Saludo				- Begrüßung
+Saludo		- Begrüßung
-Hola					- Hallo
+Hola		- Hallo
-Dias					- Tag
+Dias		- Tag
-Tardes				- Abends
+Tardes		- Abends
-Noches				- Nacht
+Noches		 - Nacht
 Bienvenido(s) - Herzlich Wilkommen (Mit Mehrzal)
 
 ## La Despedida
-Adios					- Tschüss
+Adios			- Tschüss
-Chao					- Tschau
+Chao			- Tschau
 Hasta Luego		- Bis später (formell & informell)
 Hasta Manana	- Bis Morgen
-Hasta					- Bis
+Hasta			- Bis
 
 ## Partes del Cuerpo
 piel - Haut
@@ -35,10 +35,11 @@ pies - Füße
 
 ## Misc
 cuesta - Kosten
-verdad - Wahrheit
+hielo - eis
 demasiado - zu (zu kurz, zu groß, zu alt)
-### ejemplo
+**ejemplo**
 Las pantalones estan demasiado cortos
+
 ejemplo - Beispiel
 deseo - Verlangen (desire)
 sonido - Klang, Geräusch
@@ -46,16 +47,15 @@ duermevela - Schlummer
 tonteria - Dummheit
 cariña - schätzchen
 propio - eigenes
-durchatmen - respira
+respira -  durchatmen 
 cura - heilung
 dolor - schmerz
 bastante - ziemlich
-### ejemplo
+**ejemplo**
 Tu juegas futbal bastante bien - Du spielst ziemlich gut Fußbal
 por supuesto - aber natürlich
 quizá - vielleicht
 aldrededor - ungefähr
-
 rompo - brechen
 contigo - mit dir
 conmigo - mit mir

Areas/upv/classes/analog-electricity/lab-experiment-2.md

@@ -0,0 +1,63 @@
+
+#  Voltage-controlled current source
+
+```circuitjs
+$ 1 0.000005 10.20027730826997 50 5 50 5e-11
+409 640 368 800 368 1 0.6 -16.023420346306043 0.023100000000000002 0
+v 592 432 592 384 0 0 40 1 0 0 0.5
+w 592 384 640 384 0
+r 800 368 880 368 0 470
+w 800 368 800 256 0
+w 800 256 592 256 0
+w 592 256 592 352 0
+w 592 352 640 352 0
+w 592 432 880 432 0
+w 880 368 880 432 0
+w 880 368 928 368 3
+r 928 368 928 448 0 220
+g 928 448 928 496 0 0
+R 720 400 720 496 0 0 40 -15 0 0 0.5
+R 720 336 720 208 0 0 40 15 0 0 0.5
+p 800 368 800 416 1 0 0
+o 10 16 3 159746 0.0001 0.0001 0 1
+o 3 16 3 159746 0.0001 0.0001 1 1
+38 1 F1 0 0 12 -1 Voltage
+```
+
+
+# Differentiators based on OA
+```circuitjs
+$ 1 0.000005 10.20027730826997 50 5 50 5e-11
+c 512 416 624 416 0 6.8000000000000005e-9 11.432213268038161 0.001
+409 624 432 768 432 1 0.6 29.03806612154948 0.0231 0
+r 624 352 768 352 0 470
+w 768 432 768 352 0
+w 624 416 624 352 0
+g 624 448 624 496 0 0
+R 512 416 512 480 0 1 50 5 0 0 0.5
+R 688 400 688 368 0 0 40 -15 0 0 0.5
+R 688 464 688 496 0 0 40 15 0 0 0.5
+O 768 432 832 432 1 0
+o 9 16 0 159746 14.661466041813108 0.0001 0 1
+```
+
+# Pseudo Integrators based on OA
+
+```circuitjs
+$ 1 0.000005 10.20027730826997 50 5 50 5e-11
+409 624 432 768 432 1 0.6 29.035877276181203 0.0231 0
+r 624 352 768 352 0 10000
+w 768 432 768 352 0
+w 624 416 624 352 0
+g 624 448 624 496 0 0
+R 512 416 512 480 0 1 50 1 0 0 0.5
+R 688 400 688 368 0 0 40 -15 0 0 0.5
+R 688 464 688 496 0 0 40 15 0 0 0.5
+O 768 432 832 432 1 0
+w 624 352 624 288 0
+w 768 352 768 288 0
+c 624 288 768 288 0 1.0000000000000001e-7 12.907537355618608 0.001
+r 512 416 624 416 0 1000
+o 8 16 0 159746 13.58313090577521 0.0001 0 1
+o 5 16 0 159746 0.9999999999999959 0.0001 0 2 5 3
+```

Areas/upv/classes/analog-electricity/lab-experiment-3.md

@@ -1,63 +1,68 @@
-
+# Lab Experiment 4
-#  Voltage-controlled current source
 
 ```circuitjs
-$ 1 0.000005 10.20027730826997 50 5 50 5e-11
+$ 64 0.000005 1.0312258501325766 50 5 50 5e-11
-409 640 368 800 368 1 0.6 -16.023420346306043 0.023100000000000002 0
+v 160 288 160 208 0 0 40 1 0 0 0.5
-v 592 432 592 384 0 0 40 1 0 0 0.5
+409 192 192 320 192 1 0.6 -0.38582909293815426 0.0231 0
-w 592 384 640 384 0
+w 160 208 192 208 2
-r 800 368 880 368 0 470
+w 160 288 416 288 0
-w 800 368 800 256 0
+r 320 192 416 192 0 470
-w 800 256 592 256 0
+w 416 192 416 288 0
-w 592 256 592 352 0
+w 416 192 464 192 1
-w 592 352 640 352 0
+r 464 192 464 288 0 220
-w 592 432 880 432 0
+g 464 288 464 320 0 0
-w 880 368 880 432 0
+w 192 176 160 176 0
-w 880 368 928 368 3
+w 160 176 160 112 0
-r 928 368 928 448 0 220
+w 160 112 320 112 0
-g 928 448 928 496 0 0
+w 320 112 320 192 0
-R 720 400 720 496 0 0 40 -15 0 0 0.5
+R 256 160 256 128 0 0 40 -15 0 0 0.5
-R 720 336 720 208 0 0 40 15 0 0 0.5
+R 256 224 256 272 0 0 40 -15 0 0 0.5
-p 800 368 800 416 1 0 0
+O 464 192 528 192 1 0
-o 10 16 3 159746 0.0001 0.0001 0 1
+38 0 F1 0 0 12 -1 Vin
-o 3 16 3 159746 0.0001 0.0001 1 1
-38 1 F1 0 0 12 -1 Voltage
 ```
 
 
-# Differentiators based on OA
+| Vin(V) | Aout(mA) |
-```circuitjs
+|----|-------|
-$ 1 0.000005 10.20027730826997 50 5 50 5e-11
+| 0 | 2.13 |
-c 512 416 624 416 0 6.8000000000000005e-9 11.432213268038161 0.001
+| 1 | 4.26 |
-409 624 432 768 432 1 0.6 29.03806612154948 0.0231 0
+| 2 | 6.38 |
-r 624 352 768 352 0 470
+| 3 | 8.2 |
-w 768 432 768 352 0
+| 4 | 9 |
-w 624 416 624 352 0
+| 5 | 10 |
-g 624 448 624 496 0 0
+| 6 | 12 |
-R 512 416 512 480 0 1 50 5 0 0 0.5
+| 7 | 12 |
-R 688 400 688 368 0 0 40 -15 0 0 0.5
+| 8 | 12 |
-R 688 464 688 496 0 0 40 15 0 0 0.5
+| 9 | 12 |
-O 768 432 832 432 1 0
+| 10 | 12  |
-o 9 16 0 159746 14.661466041813108 0.0001 0 1
+| 11 | 12 |
+| 12 | 12 |
+^data
+
+```chart  
+type: line
+beginAtZero: true
+id: data
+tension: .1
+legend: true
+layout: columns  
+width: 80%
 ```
 
-# Pseudo Integrators based on OA
+
+
 
 ```circuitjs
-$ 1 0.000005 10.20027730826997 50 5 50 5e-11
+$ 64 0.000005 1.0312258501325766 50 5 50 5e-11
-409 624 432 768 432 1 0.6 29.035877276181203 0.0231 0
+v 128 288 128 192 0 1 40 5 0 0 0.5
-r 624 352 768 352 0 10000
+c 128 192 240 192 0 0.00001 8.034961945589814 0.001
-w 768 432 768 352 0
+w 240 192 240 112 0
-w 624 416 624 352 0
+r 240 112 352 112 0 1000
-g 624 448 624 496 0 0
+g 240 224 240 288 0 0
-R 512 416 512 480 0 1 50 1 0 0 0.5
+g 128 288 128 320 0 0
-R 688 400 688 368 0 0 40 -15 0 0 0.5
+409 240 208 352 208 1 0.6 29.024347009752177 0.0231 0
-R 688 464 688 496 0 0 40 15 0 0 0.5
+R 288 176 288 144 0 0 40 -15 0 0 0.5
-O 768 432 832 432 1 0
+R 288 240 288 288 0 0 40 15 0 0 0.5
-w 624 352 624 288 0
+w 352 208 352 112 0
-w 768 352 768 288 0
+O 352 208 416 208 1 0
-c 624 288 768 288 0 1.0000000000000001e-7 12.907537355618608 0.001
-r 512 416 624 416 0 1000
-o 8 16 0 159746 13.58313090577521 0.0001 0 1
-o 5 16 0 159746 0.9999999999999959 0.0001 0 2 5 3
 ```

Areas/upv/classes/ingles-especialidad/07-class.md

@@ -0,0 +1,63 @@
+# Class 07
+
+## Task 5
+1. **by**
+2. **for**
+3. **by**
+4. **for**
+5. **by**
+6. **for**
+
+## Task 6
+1. The emails were **sent** yesterday.
+2. Too many charges **have** been made too quickly.
+3. The faulty device was sold **by** most shops
+4. The report will **be** published next week.
+5. 
+
+**7.4**
+Task 7 → c
+
+Task 8
+a. Important changes...
+b. Online Service Director
+c. Dear Customer
+d. Pauline Harris
+e. You do not
+
+Task 9
+1. I will send you the form through post. You will receive it probably this week.
+2. From next month check-In is not going to be available.
+3. Bew charges will appl in this car park. You will not be charged by the hour anymore.
+4. Due to lack of space, you are not allowed to take your bike on the train anymore.
+5. You have to contact 
+
+# Chapter 8
+Task 2
+**Flexitime** means that you do not have to start working at a specific time.
+
+**dress-down Fridays**
+Come to work in casual clothing.
+
+**Paternity Leave**
+If you are a parent you can leave for some months after your childs birth. Usually with reduced pay.
+
+**Desperation**
+You will do anything for the situation to change
+
+**Contention**
+
+**Childcare facilities**
+
+Task 8.1
+a: Honest Debates
+b: 
+c: Finding Balance, demands taking control
+d: Careful, Realistic
+e:
+f: Balanced takes to work-life balance
+
+
+# Homework
+ 
+ Activities 8.2 8.3

Areas/upv/classes/ingles-especialidad/07-email.md

@@ -0,0 +1,39 @@
+# Email
+
+Dear Bank,
+I have now tried several times to log in to my online bank account. 
+The problem appears as soon as I start typing in my login credentials.
+The screen freezes, and I am not able to finish the login process.
+Any help would be very much appreciated. 
+My account name is "P J Watson", the branch code is "15 78 65".
+
+Greetings,
+
+Max Richter
+
+Notes
+- Link sentences
+- Problem first
+
+
+## Version 2
+
+Dear Sir/Madam,
+I am currently experiencing some problems logging in to my online bank account, 
+as soon as I start typing in my login credentials the screen freezes, 
+and I am not able to complete the login process.
+My account name is "P J Watson" and my branch code is "15 78 65"
+
+Any help with this problem would be very much appreciated, 
+
+Thank you in advance,
+
+Max Richter
+
+
+Notes
+- Dear Sir/Madam/To whom it may concern
+
+
+
+