From c559616bfe348aa5968b42e4f2fb0186d8da9ff9 Mon Sep 17 00:00:00 2001 From: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Sun, 18 Jul 2021 16:09:50 -0600 Subject: [PATCH] feat: update basque course MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add files via upload * Add files via upload * Delete 07-Noren-4.yaml * Delete 07-Noren-3.yaml * Delete 07-Noren-2.yaml * Delete 07-Noren-1.yaml * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Delete courses/basque-from-english/09-Family directory * Delete family-1.json * Add files via upload * Delete 03-PeopleAndPast-3.yaml * Delete 03-PeopleAndPast-3.md * Delete 03-PeopleAndPast-2.yaml * Delete 03-PeopleAndPast-2.md * Delete 03-PeopleAndPast-1.yaml * Delete 03-PeopleAndPast-1.md * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Delete 07-Noren-1.md * Delete 07-Noren-1.yaml * Delete 07-Noren-2.md * Delete 07-Noren-2.yaml * Delete 07-Noren-3.md * Delete 07-Noren-3.yaml * Delete 07-Noren-4.md * Delete 07-Noren-4.yaml * Add files via upload * Add files via upload * Create 10-number.md * Add files via upload * Delete module.yaml * Delete 10-number.md * Create 10-numbers1.md * Delete 10-numbers1.md * Add files via upload * fix: fix images * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * fix a couple translations in basics 2 * fix things Squashed commit of the following: commit 8ae463e64285a46c4e911b7d99abf922484f1274 Author: Dániel Kántor Date: Sun Jul 18 23:59:07 2021 +0200 fix things commit 32fdc50f3965ddb869c7b43f350f1b81a27cb9fe Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Sat Jul 3 15:03:39 2021 -0600 Add files via upload commit 9eb8211fbd0b37b685a60b628439f71f69f9a416 Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Sat Jun 26 14:16:07 2021 -0600 Add files via upload commit 2ac35e51dbe9c61a2286cc041fc8e323fdacc661 Author: Dániel Kántor Date: Sat Jun 26 18:29:58 2021 +0200 fix: fix images commit 16adaeb38ef3699c624b526f92fbdcc5d789cc49 Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Fri Jun 25 15:17:06 2021 -0600 Add files via upload commit e023f7c15d0bbf1b64943e96005f680e8263de44 Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Fri Jun 25 15:09:04 2021 -0600 Add files via upload commit 5b433174d043a0ea15ab066c895d1ac2712a54f3 Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Fri Jun 25 15:08:19 2021 -0600 Add files via upload commit 323ff6a639c28108412fd12cc24b94421f0b5248 Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Fri Jun 25 15:04:54 2021 -0600 Add files via upload commit d8a07cfc811e733f8fc60bf839680b4803a2ea88 Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Fri Jun 25 15:03:07 2021 -0600 Add files via upload commit cae326db79a7a02ba906ba303dc71609dd8b3874 Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Fri Jun 25 14:59:39 2021 -0600 Add files via upload commit aec0949b95c999f2e182d6dc3f3ae5e9fbadb726 Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Thu Jun 24 16:43:20 2021 -0600 Add files via upload commit 36f27cc30b3c80d5802df9edf4c2f51fd8de4862 Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Wed Jun 23 16:41:25 2021 -0600 Add files via upload commit c7daa3814e6d0be13387815e33e9f7c7d29ac83f Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Mon Jun 21 17:59:51 2021 -0600 Add files via upload commit fe34b64be7d3dd36137ff088cb9f903d30bd35ea Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Mon Jun 21 17:56:53 2021 -0600 Add files via upload commit 81a9b2e2cdb32517d85a3d415f77e89bb42f52ea Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Mon Jun 21 17:55:56 2021 -0600 Add files via upload commit 3d0f8326f0d0b33eea3456e706cdba17d88184cb Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Mon Jun 21 17:54:47 2021 -0600 Add files via upload commit ebac05b07510acf5f9e8006b5710d99cb10bdb1b Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Mon Jun 21 17:53:23 2021 -0600 Add files via upload commit 1b6c85afbd237e216f25e39f131e505fdf65ccaf Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Mon Jun 21 17:50:17 2021 -0600 Add files via upload commit 61f3581fd55e23caec985af7179113518ccb164e Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Fri Jun 18 20:11:55 2021 -0600 Delete family-1.json commit 1028a766368d6bd593cb8fbb90adb08847604563 Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Fri Jun 18 20:01:03 2021 -0600 Delete courses/basque-from-english/09-Family directory commit b4fea6dbb1b0ff1f0c0aee4a71108ab5092bda9b Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Wed Jun 16 16:01:03 2021 -0600 Add files via upload commit 68824c06289d43d6877171ef9099f028daf0a23f Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Wed Jun 16 16:00:12 2021 -0600 Add files via upload commit fecbc34644fa763061b1710748a25547e6a2a19e Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Wed Jun 16 15:54:51 2021 -0600 Add files via upload commit f248da8f799c7e8f06189e2fd2e0dbc3b883937b Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Sat Jun 12 15:07:25 2021 -0600 Add files via upload commit 7fecc913e396f7c3fe3c113e42c11f5fd2e79920 Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Sat Jun 12 15:05:29 2021 -0600 Add files via upload commit d01881300357b16b8e5791f1fb093413e33b65b7 Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Sat Jun 12 15:00:56 2021 -0600 Add files via upload commit 7adfdb4795403eb0a6a4b403882492f2aa35040a Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Sat Jun 12 14:58:17 2021 -0600 Add files via upload commit 32fc4280b5a382136366e7bafe50e4b00fc1a62d Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Sat Jun 12 14:56:19 2021 -0600 Add files via upload commit 6939e243caa08266b21e19c7ae4a41c8894551a3 Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Wed Jun 9 21:19:17 2021 -0600 Add files via upload commit f048d576bb5b9f4d86dd500b26933fe3b15f8ddf Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Wed Jun 9 21:12:01 2021 -0600 Add files via upload commit 04bce8f91f35a132fe87c627fec629157a683e54 Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Sun Jun 6 08:03:20 2021 -0600 Add files via upload commit cd046378e5f988523ac1a50e889a24f08c9c71ef Author: Renovate Bot Date: Sun Jul 18 19:58:49 2021 +0000 chore(deps): update dependency css-loader to v5.2.7 commit d196f0797107a3cac63ba84e45b0b44fc7014cc3 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sun Jul 18 21:57:35 2021 +0200 chore(deps): update dependency svelte-preprocess-sass to v2 (#1451) Co-authored-by: Renovate Bot commit 498f3bfcec0c48c7524d433f84f6efc49193b68a Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sun Jul 18 21:57:20 2021 +0200 chore(deps): update dependency svelte-check to v2.2.3 (#1453) Co-authored-by: Renovate Bot commit a1233fe5a5486a8400858882a1a5b626cf712fc8 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sun Jul 18 21:55:56 2021 +0200 chore(deps): update dependency eslint to v7.31.0 (#1454) Co-authored-by: Renovate Bot commit 3982b024bb020bbee856851fb6001928354aa147 Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sun Jul 18 18:20:21 2021 +0200 docs: add zmbc as a contributor for doc (#1455) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> commit b1c0960a5868768d335a35fa2c0b3d4d0cf0568b Author: Zeb Burke-Conte Date: Sun Jul 18 09:19:52 2021 -0700 docs: add notes from setting up my development environment Not sure if these are helpful, but here's some documentation of additional steps I found on the way to setting up a development environment. commit 4cde4eeea3f2aa2f4ea6f3d71b369aab357fc0ff Author: Dániel Kántor Date: Wed Jul 14 09:46:21 2021 +0200 ci: run cypress on a statically built page commit e6721691ec6e941e397cd3af74528b02d2a6da7f Author: Dániel Kántor Date: Tue Jul 13 10:02:55 2021 +0200 ci: fix static build on main commit 82347b8e2a1600d03ced4325a6a8fbb9f31fe91a Author: Renovate Bot Date: Mon Jul 12 18:50:44 2021 +0000 chore(deps): update typescript-eslint monorepo to v4.28.3 commit e08db5e0337a191b0f30ddbc3aa6e8d5c4213766 Author: Dániel Kántor Date: Mon Jul 12 09:32:25 2021 +0200 test(web): fix testChallenge feature in static build commit fe77ad4a29b843b925da4f4d7db83e7e4c31319d Author: Dániel Kántor Date: Sat Jul 10 17:08:05 2021 +0200 fix: fix markdown loading commit aeceb5dc322ec8e8f11995da81cdec263e52ae7a Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon Jul 12 05:56:48 2021 +0000 docs: update .all-contributorsrc [skip ci] commit e5f4bf5235fc5c3ae32c77d453a9e743d6bbd561 Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon Jul 12 05:56:47 2021 +0000 docs: update README.md [skip ci] commit d39fb89e1e4547880f8294f1e6a642c13f81c3d9 Author: Cameron Radmore Date: Sat Jul 10 18:29:44 2021 -0400 Add missing images for french, german & parsig commit cd10f1a182182a55ea58508e3033ea4207077bb9 Author: Dániel Kántor Date: Thu Jul 1 08:45:25 2021 +0200 refactor: build test course in YAML commit 8481894c5d77395b4b4048576fd25d682f975ad0 Author: Renovate Bot Date: Fri Jul 9 13:34:58 2021 +0000 chore(deps): update dependency cypress-cucumber-preprocessor to v4.1.4 commit 3f3c866973f973c6d6cd585ee58024b306631ac8 Author: Renovate Bot Date: Fri Jul 9 12:57:49 2021 +0000 chore(deps): update dependency svelte-check to v2.2.2 commit 4d64140698a35216e86bb801ea430067bf79bedc Author: Renovate Bot Date: Fri Jul 9 11:27:08 2021 +0000 chore(deps): update dependency svelte-preprocess to v4.7.4 commit 066c16122134ffd1f52f6f757c0058a543e2840c Author: Renovate Bot Date: Wed Jul 7 17:22:29 2021 +0000 chore(deps): update dependency @types/sortablejs to v1.10.7 commit a575764ada563bd8b8a9cb2af479d86c17fc1bc1 Author: Renovate Bot Date: Wed Jul 7 17:22:12 2021 +0000 chore(deps): update dependency @types/jest to v26.0.24 commit e808934df781fe5151cbda6df1d687e8014e0917 Author: Renovate Bot Date: Wed Jul 7 17:03:50 2021 +0000 chore(deps): update dependency @types/node to v14.17.5 commit 85ed2dae68259f114050d7b9dfa4b56aad5919dc Author: Renovate Bot Date: Wed Jul 7 15:11:52 2021 +0000 chore(deps): update dependency cypress to v7.7.0 commit 2cbfa2f49a43de3de33c6679d8b13e2ec29db4bb Author: Dániel Kántor Date: Tue Jul 6 19:51:29 2021 +0200 chore: fix broken cypress in the pipeline commit dcd901ed432dacfc5d359554857ca970c6229249 Author: Renovate Bot Date: Tue Jul 6 10:26:46 2021 +0000 chore(deps): update dependency husky to v7.0.1 commit 4176379caf6051a1e1d5e06bd1bd8f7d7bf095fa Author: Renovate Bot Date: Tue Jul 6 08:26:18 2021 +0000 fix(deps): update dependency dayjs to v1.10.6 commit 8d97d0382f3354a52644612505ef6e7451b11311 Author: Renovate Bot Date: Mon Jul 5 17:53:45 2021 +0000 chore(deps): update typescript-eslint monorepo to v4.28.2 commit dd2175c9b6f3005e1aa613ccc6b0c05e1253f8d1 Author: Renovate Bot Date: Sun Jul 4 19:40:51 2021 +0000 fix(deps): update dependency sortablejs to v1.14.0 commit 301b89278ff2ae6db8454023fb704eaaf0fde9b0 Author: Renovate Bot Date: Fri Jul 2 22:30:49 2021 +0000 chore(deps): update dependency eslint to v7.30.0 commit 6d14acb998751930e813f3d1ec03348dc0bc465b Author: Renovate Bot Date: Fri Jul 2 17:05:50 2021 +0000 chore(deps): update dependency cypress-cucumber-preprocessor to v4.1.3 commit 5603f6001a328b42f9bb7cfe11d7d21f141ffc51 Author: Renovate Bot Date: Thu Jul 1 07:20:29 2021 +0000 chore(deps): update dependency husky to v7 commit 367b7141655520349713c59f338497d2b9471f37 Author: Renovate Bot Date: Thu Jul 1 01:13:52 2021 +0000 chore(deps): update dependency typescript to v4.3.5 commit beda45641304f243efc6a61c3a5182fe57deb16f Author: Renovate Bot Date: Wed Jun 30 19:52:05 2021 +0000 fix(deps): update dependency howler to v2.2.3 commit b8e3b63749bee0d12f839050bf3139504c0987db Author: Renovate Bot Date: Wed Jun 30 16:24:57 2021 +0000 chore(deps): update dependency @percy/cli to v1.0.0-beta.58 commit dd62de717befeff04e924fb082f04370b262ea15 Author: Dániel Kántor Date: Tue Jun 29 20:22:08 2021 +0200 chore: fix poetry.lock commit b28edf78c82b97420b5c358bca0b05744da7c337 Author: Dániel Kántor Date: Tue Jun 29 20:11:46 2021 +0200 chore: fix poetry.lock files commit e21e5032e4464abecf5b3557855ce01bfa5ed2fa Author: Dániel Kántor Date: Tue Jun 29 09:59:15 2021 +0200 chore: make python package compatible with Python 3.8 commit 271e618852da3e8d4cdc56f95ef32b398721613b Author: Renovate Bot Date: Mon Jun 28 23:01:10 2021 +0000 chore(deps): update typescript-eslint monorepo to v4.28.1 commit b455687e4aac3b3ec9a50dbdd99ad42c82ad374e Author: Renovate Bot Date: Mon Jun 28 21:33:49 2021 +0000 chore(deps): update jest monorepo to v27.0.6 commit 5354574082e77e653f84a56cb4e34caef425fffd Author: Renovate Bot Date: Mon Jun 28 19:52:56 2021 +0000 chore(deps): update dependency @percy/cli to v1.0.0-beta.57 commit 97fd190ddd7412fed30f8a009cbc49056c8cdb3e Author: Renovate Bot Date: Mon Jun 28 17:39:59 2021 +0000 chore(deps): update dependency mini-css-extract-plugin to v1.6.2 commit be1a0df5af1b9541c094847e7e56756160d5b66d Author: Renovate Bot Date: Mon Jun 28 00:11:58 2021 +0000 fix(deps): update dependency howler to v2.2.2 commit d2cf42b00e9eb53107fff92dda4d480e73fea100 Author: Dániel Kántor Date: Sun Jun 27 11:39:58 2021 +0200 chore(ci): run mypy in the pipeline commit 0e495bc189174cf4e99f3af1fb839536b4139504 Author: ImgBotApp Date: Sat Jun 26 16:49:02 2021 +0000 [ImgBot] Optimize images *Total -- 4,285.25kb -> 4,183.38kb (2.38%) /apps/web/static/images/gray2.jpg -- 69.81kb -> 65.53kb (6.14%) /apps/web/static/images/euro1.jpg -- 67.88kb -> 64.38kb (5.15%) /apps/web/static/images/market3.jpg -- 76.46kb -> 72.66kb (4.96%) /apps/web/static/images/purple2_tiny.jpg -- 17.72kb -> 16.84kb (4.96%) /apps/web/static/images/market3_tiny.jpg -- 20.02kb -> 19.07kb (4.76%) /apps/web/static/images/purple2.jpg -- 60.81kb -> 58.12kb (4.42%) /apps/web/static/images/minus2_tiny.jpg -- 16.90kb -> 16.16kb (4.35%) /apps/web/static/images/thirteen2.jpg -- 59.51kb -> 56.96kb (4.29%) /apps/web/static/images/ontopof1.jpg -- 25.41kb -> 24.33kb (4.27%) /apps/web/static/images/one3_tiny.jpg -- 20.41kb -> 19.57kb (4.13%) /apps/web/static/images/one3.jpg -- 67.70kb -> 64.95kb (4.06%) /apps/web/static/images/yellow1_tiny.jpg -- 16.83kb -> 16.14kb (4.05%) /apps/web/static/images/chair3.jpg -- 59.69kb -> 57.35kb (3.91%) /apps/web/static/images/restaurant3.jpg -- 67.58kb -> 65.00kb (3.83%) /apps/web/static/images/seven2.jpg -- 56.11kb -> 54.06kb (3.65%) /apps/web/static/images/gray2_tiny.jpg -- 16.38kb -> 15.78kb (3.64%) /apps/web/static/images/bridge3.jpg -- 68.42kb -> 66.00kb (3.53%) /apps/web/static/images/euro1_tiny.jpg -- 17.79kb -> 17.16kb (3.53%) /apps/web/static/images/yellow1.jpg -- 54.13kb -> 52.24kb (3.49%) /apps/web/static/images/restaurant3_tiny.jpg -- 17.81kb -> 17.19kb (3.47%) /apps/web/static/images/seven1.jpg -- 49.88kb -> 48.16kb (3.45%) /apps/web/static/images/minus2.jpg -- 48.70kb -> 47.03kb (3.44%) /apps/web/static/images/market2.jpg -- 56.89kb -> 54.95kb (3.41%) /apps/web/static/images/gray1.jpg -- 54.24kb -> 52.40kb (3.4%) /apps/web/static/images/five2.jpg -- 10.17kb -> 9.83kb (3.36%) /apps/web/static/images/nextto1.jpg -- 61.31kb -> 59.30kb (3.28%) /apps/web/static/images/eight2.jpg -- 58.05kb -> 56.18kb (3.22%) /apps/web/static/images/between1.jpg -- 51.54kb -> 49.97kb (3.05%) /apps/web/static/images/chair1.jpg -- 52.80kb -> 51.26kb (2.93%) /apps/web/static/images/market1_tiny.jpg -- 14.86kb -> 14.42kb (2.93%) /apps/web/static/images/five1.jpg -- 32.99kb -> 32.03kb (2.93%) /apps/web/static/images/seventeen2.jpg -- 56.03kb -> 54.40kb (2.91%) /apps/web/static/images/restaurant1_tiny.jpg -- 15.81kb -> 15.36kb (2.87%) /apps/web/static/images/ontopof2.jpg -- 16.54kb -> 16.07kb (2.86%) /apps/web/static/images/eleven2.jpg -- 53.48kb -> 51.95kb (2.85%) /apps/web/static/images/oldtown2_tiny.jpg -- 16.73kb -> 16.27kb (2.75%) /apps/web/static/images/green1.jpg -- 57.35kb -> 55.78kb (2.74%) /apps/web/static/images/market1.jpg -- 46.90kb -> 45.63kb (2.71%) /apps/web/static/images/blue3.jpg -- 52.19kb -> 50.82kb (2.63%) /apps/web/static/images/oldtown2.jpg -- 64.99kb -> 63.29kb (2.61%) /apps/web/static/images/restaurant1.jpg -- 50.82kb -> 49.50kb (2.6%) /apps/web/static/images/black3.jpg -- 29.68kb -> 28.93kb (2.55%) /apps/web/static/images/oldtown1.jpg -- 58.20kb -> 56.72kb (2.54%) /apps/web/static/images/under1.jpg -- 36.10kb -> 35.19kb (2.54%) /apps/web/static/images/restaurant2.jpg -- 48.44kb -> 47.21kb (2.52%) /apps/web/static/images/between2.jpg -- 47.49kb -> 46.30kb (2.51%) /apps/web/static/images/bar3.jpg -- 46.33kb -> 45.20kb (2.43%) /apps/web/static/images/nextto1_tiny.jpg -- 15.96kb -> 15.58kb (2.41%) /apps/web/static/images/thirteen2_tiny.jpg -- 13.79kb -> 13.46kb (2.4%) /apps/web/static/images/infrontof3.jpg -- 45.16kb -> 44.11kb (2.33%) /apps/web/static/images/plaza3.jpg -- 46.37kb -> 45.31kb (2.27%) /apps/web/static/images/restaurant2_tiny.jpg -- 14.17kb -> 13.85kb (2.27%) /apps/web/static/images/eight1.jpg -- 38.13kb -> 37.26kb (2.26%) /apps/web/static/images/purple3.jpg -- 51.88kb -> 50.71kb (2.25%) /apps/web/static/images/bridge2.jpg -- 38.88kb -> 38.02kb (2.23%) /apps/web/static/images/nineteen1.jpg -- 47.92kb -> 46.91kb (2.12%) /apps/web/static/images/bridge3_tiny.jpg -- 16.39kb -> 16.05kb (2.07%) /apps/web/static/images/chair3_tiny.jpg -- 14.52kb -> 14.22kb (2.05%) /apps/web/static/images/basque3.jpg -- 25.72kb -> 25.19kb (2.03%) /apps/web/static/images/market2_tiny.jpg -- 14.25kb -> 13.97kb (2.02%) /apps/web/static/images/six3.jpg -- 24.18kb -> 23.70kb (1.98%) /apps/web/static/images/oldtown1_tiny.jpg -- 15.69kb -> 15.38kb (1.97%) /apps/web/static/images/plaza1.jpg -- 35.58kb -> 34.91kb (1.9%) /apps/web/static/images/blue3_tiny.jpg -- 14.85kb -> 14.57kb (1.89%) /apps/web/static/images/eight2_tiny.jpg -- 13.98kb -> 13.72kb (1.82%) /apps/web/static/images/six1.jpg -- 20.58kb -> 20.21kb (1.81%) /apps/web/static/images/fourteen3.jpg -- 16.00kb -> 15.72kb (1.8%) /apps/web/static/images/basque`.jpg -- 30.00kb -> 29.46kb (1.78%) /apps/web/static/images/plaza2.jpg -- 33.10kb -> 32.51kb (1.78%) /apps/web/static/images/oldtown3.jpg -- 43.89kb -> 43.12kb (1.75%) /apps/web/static/images/umbrella3.jpg -- 31.72kb -> 31.18kb (1.71%) /apps/web/static/images/fifteen1.jpg -- 47.92kb -> 47.10kb (1.71%) /apps/web/static/images/orange1.jpg -- 24.07kb -> 23.67kb (1.68%) /apps/web/static/images/eleven3.jpg -- 40.58kb -> 39.91kb (1.67%) /apps/web/static/images/green1_tiny.jpg -- 13.80kb -> 13.57kb (1.66%) /apps/web/static/images/behind2.jpg -- 33.50kb -> 32.95kb (1.66%) /apps/web/static/images/two1.jpg -- 22.77kb -> 22.39kb (1.66%) /apps/web/static/images/seventeen1.jpg -- 28.78kb -> 28.32kb (1.61%) /apps/web/static/images/umbrella1.jpg -- 37.06kb -> 36.48kb (1.58%) /apps/web/static/images/between2_tiny.jpg -- 12.04kb -> 11.86kb (1.55%) /apps/web/static/images/plus2.jpg -- 59.46kb -> 58.54kb (1.54%) /apps/web/static/images/twelve3.jpg -- 18.96kb -> 18.67kb (1.54%) /apps/web/static/images/door1.jpg -- 43.90kb -> 43.25kb (1.48%) /apps/web/static/images/gray1_tiny.jpg -- 8.28kb -> 8.16kb (1.47%) /apps/web/static/images/fourteen1.jpg -- 42.32kb -> 41.71kb (1.44%) /apps/web/static/images/eight3.jpg -- 21.54kb -> 21.24kb (1.41%) /apps/web/static/images/umbrella2.jpg -- 30.26kb -> 29.86kb (1.33%) /apps/web/static/images/zero2.jpg -- 24.02kb -> 23.71kb (1.32%) /apps/web/static/images/infrontof3_tiny.jpg -- 12.71kb -> 12.55kb (1.27%) /apps/web/static/images/seven2_tiny.jpg -- 9.88kb -> 9.75kb (1.23%) /apps/web/static/images/bar2_tiny.jpg -- 13.34kb -> 13.18kb (1.22%) /apps/web/static/images/under2.jpg -- 22.11kb -> 21.84kb (1.22%) /apps/web/static/images/bar3_tiny.jpg -- 12.23kb -> 12.09kb (1.19%) /apps/web/static/images/six2.jpg -- 34.09kb -> 33.69kb (1.17%) /apps/web/static/images/ten2.jpg -- 25.10kb -> 24.81kb (1.13%) /apps/web/static/images/ten1.jpg -- 36.86kb -> 36.45kb (1.11%) /apps/web/static/images/chair1_tiny.jpg -- 12.40kb -> 12.27kb (1.1%) /apps/web/static/images/euro2.jpg -- 25.09kb -> 24.83kb (1.02%) /apps/web/static/images/infrontof1.jpg -- 27.96kb -> 27.68kb (1%) /apps/web/static/images/thirteen1.jpg -- 31.48kb -> 31.17kb (0.99%) /apps/web/static/images/sixteen1.jpg -- 21.47kb -> 21.26kb (0.97%) /apps/web/static/images/green2.jpg -- 64.88kb -> 64.26kb (0.96%) /apps/web/static/images/under3.jpg -- 56.30kb -> 55.76kb (0.96%) /apps/web/static/images/fifteen3.jpg -- 19.50kb -> 19.32kb (0.94%) /apps/web/static/images/bar2.jpg -- 42.49kb -> 42.11kb (0.91%) /apps/web/static/images/orange2.jpg -- 31.22kb -> 30.95kb (0.87%) /apps/web/static/images/seven1_tiny.jpg -- 11.90kb -> 11.80kb (0.81%) /apps/web/static/images/plaza3_tiny.jpg -- 11.82kb -> 11.73kb (0.79%) /apps/web/static/images/sixteen1_tiny.jpg -- 6.84kb -> 6.78kb (0.79%) /apps/web/static/images/euro3.jpg -- 35.64kb -> 35.37kb (0.76%) /apps/web/static/images/basque2_tiny.jpg -- 12.92kb -> 12.82kb (0.75%) /apps/web/static/images/eleven1.jpg -- 29.91kb -> 29.69kb (0.74%) /apps/web/static/images/basque2.jpg -- 41.74kb -> 41.44kb (0.73%) /apps/web/static/images/seventeen2_tiny.jpg -- 12.92kb -> 12.83kb (0.71%) /apps/web/static/images/seventeen3.jpg -- 32.72kb -> 32.49kb (0.69%) /apps/web/static/images/window1.jpg -- 34.35kb -> 34.13kb (0.67%) /apps/web/static/images/nine3.jpg -- 29.19kb -> 29.00kb (0.64%) /apps/web/static/images/sixteen2.jpg -- 30.87kb -> 30.68kb (0.62%) /apps/web/static/images/behind1.jpg -- 21.12kb -> 21.00kb (0.58%) /apps/web/static/images/under1_tiny.jpg -- 9.74kb -> 9.69kb (0.55%) /apps/web/static/images/thirteen3.jpg -- 31.45kb -> 31.29kb (0.54%) /apps/web/static/images/between1_tiny.jpg -- 12.43kb -> 12.36kb (0.53%) /apps/web/static/images/behind3.jpg -- 28.47kb -> 28.33kb (0.48%) /apps/web/static/images/oldtown3_tiny.jpg -- 11.27kb -> 11.22kb (0.48%) /apps/web/static/images/euro3_tiny.jpg -- 11.95kb -> 11.89kb (0.46%) /apps/web/static/images/plaza1_tiny.jpg -- 9.37kb -> 9.33kb (0.38%) /apps/web/static/images/eighteen1.jpg -- 33.95kb -> 33.83kb (0.35%) /apps/web/static/images/eight1_tiny.jpg -- 10.93kb -> 10.90kb (0.33%) /apps/web/static/images/twelve2.jpg -- 15.50kb -> 15.45kb (0.3%) /apps/web/static/images/fourteen2.jpg -- 28.00kb -> 27.98kb (0.06%) /apps/web/static/images/nextto2.jpg -- 33.25kb -> 33.24kb (0.03%) Signed-off-by: ImgBotApp commit 3589e86a9f55ce70c536b7f4907fae0b575cde09 Author: Daniel Kantor Date: Sun Jun 27 10:13:08 2021 +0200 chore: set up mypy (#1407) commit c013534767f41dcd5b58de6e8ae9baf26f7f373c Author: RGBradley <78659707+RGBradley@users.noreply.github.com> Date: Sat Jun 26 10:45:53 2021 -0600 feat: update basque course * Add files via upload * Add files via upload * Delete 07-Noren-4.yaml * Delete 07-Noren-3.yaml * Delete 07-Noren-2.yaml * Delete 07-Noren-1.yaml * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Delete 09-Family-1.yaml * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Delete courses/basque-from-english/10-Egon directory * Delete courses/basque-from-english/09-Family directory * Create 09-Egon-1.md * Add files via upload * Add files via upload * Delete family-1.md * Delete family-3.md * Delete family-2.md * Delete family-1.json * Add files via upload * Delete 03-PeopleAndPast-3.yaml * Delete 03-PeopleAndPast-3.md * Delete 03-PeopleAndPast-2.yaml * Delete 03-PeopleAndPast-2.md * Delete 03-PeopleAndPast-1.yaml * Delete 03-PeopleAndPast-1.md * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Delete 07-Noren-1.md * Delete 07-Noren-1.yaml * Delete 07-Noren-2.md * Delete 07-Noren-2.yaml * Delete 07-Noren-3.md * Delete 07-Noren-3.yaml * Delete 07-Noren-4.md * Delete 07-Noren-4.yaml * Add files via upload * Add files via upload * Add files via upload * Create 10-number.md * Add files via upload * Delete module.yaml * Delete 10-number.md * Create 10-numbers1.md * Add files via upload * Add files via upload * Delete 10-numbers1.md * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * fix: fix images Co-authored-by: Dániel Kántor * fix things Co-authored-by: Dániel Kántor Co-authored-by: Daniel Kantor --- .../basque-from-english/challenges/adj-1.json | 2 +- .../basque-from-english/challenges/adj-2.json | 129 ++++- .../basque-from-english/challenges/adj-4.json | 34 +- .../challenges/animals-1.json | 12 + .../challenges/animals-2.json | 12 + .../challenges/basics-1.json | 40 ++ .../challenges/basics-2.json | 106 +--- .../challenges/egon-1.json | 82 ++- .../challenges/egon-2.json | 25 + .../challenges/egon-3.json | 22 + .../challenges/greetings-1.json | 56 +- .../challenges/greetings-2.json | 12 + .../challenges/noren-3.json | 11 + .../challenges/numbers-and-math-1.json | 55 +- .../challenges/numbers-and-math-2.json | 5 + .../challenges/numbers-and-math-3.json | 7 +- .../challenges/people-and-past-1.json | 118 +++- .../challenges/people-and-past-2.json | 327 +++++++++++ .../challenges/people-and-past-3.json | 359 +++++++++++- .../challenges/questions.json | 78 ++- .../challenges/this-that-and-my-2.json | 69 +++ .../basque-from-english/courseData.json | 12 +- .../introduction/egon-2.md | 13 - .../french-from-english/challenges/hello.json | 12 +- .../german-from-english/challenges/hello.json | 12 +- .../challenges/basic-1.json | 8 +- .../01-Basics/skills/01-basics-1.yaml | 16 + .../01-Basics/skills/01-basics-2.yaml | 9 +- .../skills/02-greetings-1.yaml | 18 + .../skills/02-greetings-2.yaml | 4 + .../skills/02-questions-1.yaml | 32 ++ .../skills/03-PeopleAndPast-1.yaml | 30 +- .../skills/03-PeopleAndPast-2.yaml | 48 ++ .../skills/03-PeopleAndPast-3.yaml | 50 +- .../04-AdjNo/skills/04-AdjNo-2.yaml | 19 +- .../04-AdjNo/skills/04-AdjNo-4.yaml | 4 +- .../05-Animaliak/skills/05-Animaliak-1.yaml | 4 + .../05-Animaliak/skills/05-Animaliak-2.yaml | 4 + .../06-ThisThatMy/skills/06-ThisThatMy-2.yaml | 26 + .../07-Noren/skills/07-Noren-3.yaml | 4 + .../09-Egon/skills/09-Egon-1.yaml | 20 +- .../09-Egon/skills/09-Egon-2.md | 13 - .../09-Egon/skills/09-Egon-2.yaml | 13 +- .../09-Egon/skills/09-Egon-3.yaml | 10 + .../09-Family/skills/09-Family-2.yaml | 521 ++++++++++++++++++ .../10-Numbers/skills/10-Numbers-1.yaml | 10 +- .../10-Numbers/skills/10-Numbers-2.yaml | 2 + .../10-Numbers/skills/10-Numbers-3.yaml | 2 + 48 files changed, 2231 insertions(+), 246 deletions(-) create mode 100644 courses/basque-from-english/09-Family/skills/09-Family-2.yaml diff --git a/apps/web/src/courses/basque-from-english/challenges/adj-1.json b/apps/web/src/courses/basque-from-english/challenges/adj-1.json index fe81120b1766..ed57774ac359 100644 --- a/apps/web/src/courses/basque-from-english/challenges/adj-1.json +++ b/apps/web/src/courses/basque-from-english/challenges/adj-1.json @@ -754,7 +754,7 @@ "Bai", "Epa", "ere", - "d" + "dira" ], "solutions": [ [ diff --git a/apps/web/src/courses/basque-from-english/challenges/adj-2.json b/apps/web/src/courses/basque-from-english/challenges/adj-2.json index 19498120e198..072f76dcd44e 100644 --- a/apps/web/src/courses/basque-from-english/challenges/adj-2.json +++ b/apps/web/src/courses/basque-from-english/challenges/adj-2.json @@ -1893,11 +1893,11 @@ }, { "type": "options", - "formInTargetLanguage": "Hura ez da medikua, baina medikua zen.", + "formInTargetLanguage": "Hura ez da medikua, baina ni medikua zen.", "meaningInSourceLanguage": "She is not a doctor, but I was a doctor.", - "id": "ab6402c40b78", + "id": "2d4527679520", "priority": 0, - "group": "9113111c80a0" + "group": "8a2141e13118" }, { "type": "chips", @@ -1950,14 +1950,16 @@ "da", "medikua", "baina", + "ni", "medikua", "zen", "dira", - "eta", "a", + "eta", "sei", - "edo", - "gida" + "Ni", + "i", + "ona" ], "solutions": [ [ @@ -1966,14 +1968,41 @@ "da", "medikua", "baina", + "ni", + "medikua", + "zen" + ], + [ + "Hura", + "ez", + "da", + "medikua", + "baina", + "medikua", + "zen" + ], + [ + "Ez", + "da", + "medikua", + "ni", + "baina", + "medikua", + "zen" + ], + [ + "Ez", + "da", + "medikua", + "baina", "medikua", "zen" ] ], - "formattedSolution": "Hura ez da medikua, baina medikua zen.", - "id": "3031f73cf38f", + "formattedSolution": "Hura ez da medikua, baina ni medikua zen.", + "id": "a7bf7657a915", "priority": 2, - "group": "9113111c80a0" + "group": "8a2141e13118" }, { "type": "chips", @@ -1999,6 +2028,10 @@ "word": "baina", "definition": "but\nbut(contrast)" }, + { + "word": "ni", + "definition": "I\nme" + }, { "word": "medikua", "definition": "doctor\nthe doctor" @@ -2056,17 +2089,17 @@ ] ], "formattedSolution": "She is not a doctor, but I was a doctor.", - "id": "ed0b06276426", + "id": "ff8d78bf908a", "priority": 2, - "group": "9113111c80a0" + "group": "8a2141e13118" }, { "type": "options", - "formInTargetLanguage": "Hura ez zen ikaslea, baina irakaslea nintzen.", + "formInTargetLanguage": "Hura ez zen ikaslea, baina ni irakaslea nintzen.", "meaningInSourceLanguage": "He was not a student, but I was a teacher.", - "id": "8b7836ccf731", + "id": "83f643cc026a", "priority": 0, - "group": "2d5adab37598" + "group": "4fb531bf6d70" }, { "type": "chips", @@ -2119,14 +2152,16 @@ "zen", "ikaslea", "baina", + "ni", "irakaslea", "nintzen", "ken", - "zuen", - "nirea", "sei", - "zara", - "luzea" + "nirea", + "i", + "al", + "ona", + "nire" ], "solutions": [ [ @@ -2135,14 +2170,41 @@ "zen", "ikaslea", "baina", + "ni", + "irakaslea", + "nintzen" + ], + [ + "Hura", + "ez", + "zen", + "ikaslea", + "baina", + "irakaslea", + "nintzen" + ], + [ + "Ez", + "zen", + "ikaslea", + "baina", + "ni", + "irakaslea", + "nintzen" + ], + [ + "Ez", + "zen", + "ikaslea", + "baina", "irakaslea", "nintzen" ] ], - "formattedSolution": "Hura ez zen ikaslea, baina irakaslea nintzen.", - "id": "4b3624b1a98c", + "formattedSolution": "Hura ez zen ikaslea, baina ni irakaslea nintzen.", + "id": "b65b210bc564", "priority": 2, - "group": "2d5adab37598" + "group": "4fb531bf6d70" }, { "type": "chips", @@ -2168,6 +2230,10 @@ "word": "baina", "definition": "but\nbut(contrast)" }, + { + "word": "ni", + "definition": "I\nme" + }, { "word": "irakaslea", "definition": "a teacher\nteacher\nthe teacher" @@ -2225,9 +2291,9 @@ ] ], "formattedSolution": "He was not a student, but I was a teacher.", - "id": "b2cf321574b0", + "id": "1dff0e344bff", "priority": 2, - "group": "2d5adab37598" + "group": "4fb531bf6d70" }, { "type": "options", @@ -2281,6 +2347,11 @@ "ez", "zara", "polizia" + ], + [ + "Ez", + "zara", + "polizia" ] ], "formattedSolution": "Zu ez zara polizia.", @@ -2403,6 +2474,13 @@ "medikuak", "baizik", "erizainak" + ], + [ + "Ez", + "ginen", + "medikuak", + "baizik", + "erizainak" ] ], "formattedSolution": "Gu ez ginen medikuak, baizik erizainak.", @@ -2511,6 +2589,11 @@ "ez", "zineten", "turistak" + ], + [ + "Ez", + "zineten", + "turistak" ] ], "formattedSolution": "Zuek ez zineten turistak.", diff --git a/apps/web/src/courses/basque-from-english/challenges/adj-4.json b/apps/web/src/courses/basque-from-english/challenges/adj-4.json index 9e9c26c5db81..0dc0680b8d75 100644 --- a/apps/web/src/courses/basque-from-english/challenges/adj-4.json +++ b/apps/web/src/courses/basque-from-english/challenges/adj-4.json @@ -702,11 +702,11 @@ }, { "type": "options", - "formInTargetLanguage": "Medikua ez da itsusia, baizik ederra da", + "formInTargetLanguage": "Medikua ez da itsusia, baizik ederra da.", "meaningInSourceLanguage": "The doctor is not ugly, but rather he is handsome.", - "id": "52c093b8c6ff", + "id": "55c928b5b578", "priority": 0, - "group": "f147b79de7fa" + "group": "ec20205b07f2" }, { "type": "chips", @@ -764,9 +764,9 @@ "a", "eta", "dira", - "d", "edo", - "sei" + "sei", + "Ni" ], "solutions": [ [ @@ -777,12 +777,22 @@ "baizik", "ederra", "da" + ], + [ + "Medikua", + "ez", + "da", + "itsusia", + "baizik", + "hura", + "ederra", + "da" ] ], - "formattedSolution": "Medikua ez da itsusia, baizik ederra da", - "id": "02e8b5e6696f", + "formattedSolution": "Medikua ez da itsusia, baizik ederra da.", + "id": "a0444c775123", "priority": 2, - "group": "f147b79de7fa" + "group": "ec20205b07f2" }, { "type": "chips", @@ -813,7 +823,7 @@ "definition": "beautiful\nhandsome" }, { - "word": "da", + "word": "da.", "definition": "he is (izan)\nis\nit is (izan)\nshe is (izan)" } ], @@ -889,9 +899,9 @@ ] ], "formattedSolution": "The doctor is not ugly, but rather he is handsome.", - "id": "218325a259c4", + "id": "0a055fd77be7", "priority": 2, - "group": "f147b79de7fa" + "group": "ec20205b07f2" }, { "type": "options", @@ -1202,7 +1212,7 @@ "ederra", "dira", "a", - "d" + "eta" ], "solutions": [ [ diff --git a/apps/web/src/courses/basque-from-english/challenges/animals-1.json b/apps/web/src/courses/basque-from-english/challenges/animals-1.json index 2856fc2b9d0b..f61ada69d9be 100644 --- a/apps/web/src/courses/basque-from-english/challenges/animals-1.json +++ b/apps/web/src/courses/basque-from-english/challenges/animals-1.json @@ -1833,6 +1833,12 @@ "gizen", "bat", "nintzen" + ], + [ + "Katu", + "gizen", + "bat", + "nintzen" ] ], "formattedSolution": "Ni katu gizen bat nintzen.", @@ -1948,6 +1954,12 @@ "argal", "bat", "zinen" + ], + [ + "Txakur", + "argal", + "bat", + "zinen" ] ], "formattedSolution": "Zu txakur argal bat zinen.", diff --git a/apps/web/src/courses/basque-from-english/challenges/animals-2.json b/apps/web/src/courses/basque-from-english/challenges/animals-2.json index 4efa27cf914c..0b9df6b5c325 100644 --- a/apps/web/src/courses/basque-from-english/challenges/animals-2.json +++ b/apps/web/src/courses/basque-from-english/challenges/animals-2.json @@ -43,6 +43,10 @@ "Zu", "sagua", "zara" + ], + [ + "Sagua", + "zara" ] ], "formattedSolution": "Zu sagua zara.", @@ -799,6 +803,14 @@ "ardi", "laburak", "zarete" + ], + [ + "Txerri", + "altuak", + "eta", + "ardi", + "laburak", + "zarete" ] ], "formattedSolution": "Zuek txerri altuak eta ardi laburak zarete.", diff --git a/apps/web/src/courses/basque-from-english/challenges/basics-1.json b/apps/web/src/courses/basque-from-english/challenges/basics-1.json index bf0876cf2832..e46014efc631 100644 --- a/apps/web/src/courses/basque-from-english/challenges/basics-1.json +++ b/apps/web/src/courses/basque-from-english/challenges/basics-1.json @@ -46,6 +46,11 @@ "gizon", "bat", "naiz" + ], + [ + "Gizon", + "bat", + "naiz" ] ], "formattedSolution": "Ni gizon bat naiz.", @@ -146,6 +151,11 @@ "Ni", "Terese", "naiz" + ], + [ + "Kaixo", + "Terese", + "naiz" ] ], "formattedSolution": "Kaixo. Ni Terese naiz.", @@ -240,6 +250,11 @@ "neska", "bat", "naiz" + ], + [ + "Neska", + "bat", + "naiz" ] ], "formattedSolution": "Ni neska bat naiz.", @@ -347,6 +362,12 @@ "mutil", "bat", "naiz" + ], + [ + "Kaixo", + "Mutil", + "bat", + "naiz" ] ], "formattedSolution": "Kaixo, Ni mutil bat naiz.", @@ -455,6 +476,11 @@ "neska", "bat", "zara" + ], + [ + "Neska", + "bat", + "zara" ] ], "formattedSolution": "Zu neska bat zara.", @@ -555,6 +581,11 @@ "emakume", "bat", "zara" + ], + [ + "Emakume", + "bat", + "zara" ] ], "formattedSolution": "Zu emakume bat zara.", @@ -655,6 +686,11 @@ "gizon", "bat", "zara" + ], + [ + "Gizon", + "bat", + "zara" ] ], "formattedSolution": "Zu gizon bat zara.", @@ -748,6 +784,10 @@ "Hura", "Mikel", "da" + ], + [ + "Mikel", + "da" ] ], "formattedSolution": "Hura Mikel da.", diff --git a/apps/web/src/courses/basque-from-english/challenges/basics-2.json b/apps/web/src/courses/basque-from-english/challenges/basics-2.json index ae5ca56ae9b0..47183eb450d5 100644 --- a/apps/web/src/courses/basque-from-english/challenges/basics-2.json +++ b/apps/web/src/courses/basque-from-english/challenges/basics-2.json @@ -736,10 +736,10 @@ { "type": "options", "formInTargetLanguage": "Zu Mikel zara. Zu gizona zara.", - "meaningInSourceLanguage": "You are a Mikel. You are a man.", - "id": "4d350ba275b5", + "meaningInSourceLanguage": "You are Mikel. You are a man.", + "id": "fb841aab2172", "priority": 0, - "group": "ea134d56dae2" + "group": "0a104d711ab7" }, { "type": "chips", @@ -753,10 +753,6 @@ "word": "are", "definition": "daude (egon)\ndira\ndira (izan)\ngara\ngara (izan)\ngare\ngaude (egon)\nzara\nzara (izan)\nzarete\nzaude (egon)\nzaude (egon)\nzaudete (egon)" }, - { - "word": "a", - "definition": "-a" - }, { "word": "Mikel.", "definition": "Mikel (male name)\nMikel (name)\nMikel(male name)" @@ -822,9 +818,9 @@ ] ], "formattedSolution": "Zu Mikel zara. Zu gizona zara.", - "id": "288957726794", + "id": "ef77523fa930", "priority": 2, - "group": "ea134d56dae2" + "group": "0a104d711ab7" }, { "type": "chips", @@ -858,7 +854,6 @@ "chips": [ "You", "are", - "a", "Mikel", "You", "are", @@ -867,8 +862,7 @@ "an", "am", "e", - "r", - "o", + "Are", "or", "me" ], @@ -876,7 +870,6 @@ [ "You", "are", - "a", "Mikel", "You", "are", @@ -886,7 +879,6 @@ [ "You", "are", - "a", "Mikel", "You", "are", @@ -894,10 +886,10 @@ "man" ] ], - "formattedSolution": "You are a Mikel. You are a man.", - "id": "b1ba63cadddc", + "formattedSolution": "You are Mikel. You are a man.", + "id": "65addab069ad", "priority": 2, - "group": "ea134d56dae2" + "group": "0a104d711ab7" }, { "type": "options", @@ -1052,7 +1044,6 @@ [ "You", "are", - "a", "Aitor", "You", "are", @@ -1445,80 +1436,11 @@ "da" ], [ - "M" - ], - [ - "i" - ], - [ - "r" - ], - [ - "e" - ], - [ - "n" - ], - [], - [ - "d" - ], - [ - "a" - ], - [ - "" - ], - [], - [ - "M" - ], - [ - "i" - ], - [ - "r" - ], - [ - "e" - ], - [ - "n" - ], - [], - [ - "e" - ], - [ - "m" - ], - [ - "a" - ], - [ - "k" - ], - [ - "u" - ], - [ - "m" - ], - [ - "e" - ], - [ - "a" - ], - [], - [ - "d" - ], - [ - "a" - ], - [ - "" + "Miren", + "da", + "Miren", + "emakumea", + "da" ] ], "formattedSolution": "Hura Miren da. Miren emakumea da.", diff --git a/apps/web/src/courses/basque-from-english/challenges/egon-1.json b/apps/web/src/courses/basque-from-english/challenges/egon-1.json index efe2ce5c5fac..d4f74a8bc0c2 100644 --- a/apps/web/src/courses/basque-from-english/challenges/egon-1.json +++ b/apps/web/src/courses/basque-from-english/challenges/egon-1.json @@ -53,6 +53,12 @@ "Non", "zaude", "zu" + ], + [ + "Arratsalde", + "on", + "Non", + "zaude" ] ], "formattedSolution": "Arratsalde on. Non zaude zu?", @@ -112,11 +118,11 @@ }, { "type": "options", - "formInTargetLanguage": "Ni etxean nago", + "formInTargetLanguage": "Ni etxean nago.", "meaningInSourceLanguage": "I am in the house.", - "id": "7eec5c109d48", + "id": "656a90d447fd", "priority": 0, - "group": "0919f45a5103" + "group": "86fd0146dec0" }, { "type": "chips", @@ -155,12 +161,16 @@ "Ni", "etxean", "nago" + ], + [ + "Etxean", + "nago" ] ], - "formattedSolution": "Ni etxean nago", - "id": "908ee35d243a", + "formattedSolution": "Ni etxean nago.", + "id": "ba1182131674", "priority": 2, - "group": "0919f45a5103" + "group": "86fd0146dec0" }, { "type": "chips", @@ -175,7 +185,7 @@ "definition": "in the house" }, { - "word": "nago", + "word": "nago.", "definition": "I am (egon)" } ], @@ -207,9 +217,9 @@ ] ], "formattedSolution": "I am in the house.", - "id": "98b5b3d80744", + "id": "78c5984905af", "priority": 2, - "group": "0919f45a5103" + "group": "86fd0146dec0" }, { "type": "options", @@ -256,6 +266,12 @@ "Barkatu", "Non", "nago" + ], + [ + "Barkatu", + "Ni", + "non", + "nago" ] ], "formattedSolution": "Barkatu. Non nago?", @@ -364,6 +380,14 @@ "Gure", "ostatuan", "zaude" + ], + [ + "Egun", + "on", + "Zu", + "gure", + "ostatuan", + "zaude" ] ], "formattedSolution": "Egun on. Gure ostatuan zaude.", @@ -860,6 +884,12 @@ "Barkatu", "Non", "gaude" + ], + [ + "Barkatu", + "Gu", + "non", + "gaude" ] ], "formattedSolution": "Barkatu. Non gaude?", @@ -965,6 +995,13 @@ "on", "Elizan", "gaude" + ], + [ + "Egun", + "on", + "Gu", + "elizan", + "gaude" ] ], "formattedSolution": "Egun on. Elizan gaude.", @@ -1091,6 +1128,26 @@ "Gu", "barruan", "gaude" + ], + [ + "Zuek", + "kanpoan", + "zaudete", + "Barruan", + "gaude" + ], + [ + "Kanpoan", + "zaudete", + "Gu", + "barruan", + "gaude" + ], + [ + "Kanpoan", + "zaudete", + "Barruan", + "gaude" ] ], "formattedSolution": "Zuek kanpoan zaudete. Gu barruan gaude.", @@ -1223,6 +1280,11 @@ "elizan", "ere", "zaudete" + ], + [ + "Elizan", + "ere", + "zaudete" ] ], "formattedSolution": "Zuek elizan ere zaudete.", @@ -1676,7 +1738,7 @@ "gaude", "gu", "Zu", - "u" + "Gu" ], "solutions": [ [ diff --git a/apps/web/src/courses/basque-from-english/challenges/egon-2.json b/apps/web/src/courses/basque-from-english/challenges/egon-2.json index 1e769ed107b0..befd8dfa0b5c 100644 --- a/apps/web/src/courses/basque-from-english/challenges/egon-2.json +++ b/apps/web/src/courses/basque-from-english/challenges/egon-2.json @@ -455,6 +455,10 @@ "Gu", "Madrilen", "gaude" + ], + [ + "Madrilen", + "gaude" ] ], "formattedSolution": "Gu Madrilen gaude.", @@ -884,6 +888,10 @@ "Zuek", "basoan", "zaudete" + ], + [ + "Basoan", + "zaudete" ] ], "formattedSolution": "Zuek basoan zaudete.", @@ -987,6 +995,10 @@ "Non", "daude", "haiek" + ], + [ + "Non", + "daude" ] ], "formattedSolution": "Non daude haiek?", @@ -1071,6 +1083,10 @@ "Haiek", "han", "daude" + ], + [ + "Han", + "daude" ] ], "formattedSolution": "Haiek han daude.", @@ -1165,6 +1181,11 @@ "Euskal", "Herrian", "zaudete" + ], + [ + "Euskal", + "Herrian", + "zaudete" ] ], "formattedSolution": "Zuek Euskal Herrian zaudete.", @@ -1794,6 +1815,10 @@ "Ni", "hemen", "nago" + ], + [ + "Hemen", + "nago" ] ], "formattedSolution": "Ni hemen nago.", diff --git a/apps/web/src/courses/basque-from-english/challenges/egon-3.json b/apps/web/src/courses/basque-from-english/challenges/egon-3.json index 51e865428dc8..4cab43827516 100644 --- a/apps/web/src/courses/basque-from-english/challenges/egon-3.json +++ b/apps/web/src/courses/basque-from-english/challenges/egon-3.json @@ -43,6 +43,10 @@ "Hura", "Frantzia", "dago" + ], + [ + "Frantzia", + "dago" ] ], "formattedSolution": "Hura Frantzia dago.", @@ -324,6 +328,10 @@ "Gu", "Gasteizen", "gaude" + ], + [ + "Gasteizen", + "gaude" ] ], "formattedSolution": "Gu Gasteizen gaude.", @@ -1090,6 +1098,10 @@ "Haiek", "han", "daude" + ], + [ + "Han", + "daude" ] ], "formattedSolution": "Haiek han daude.", @@ -1175,6 +1187,11 @@ [ "Irunan", "nago" + ], + [ + "Ni", + "Irunan", + "nago" ] ], "formattedSolution": "Irunan nago.", @@ -1265,6 +1282,11 @@ "Euskal", "Herrian", "zaude" + ], + [ + "Euskal", + "Herrian", + "zaude" ] ], "formattedSolution": "Zu Euskal Herrian zaude.", diff --git a/apps/web/src/courses/basque-from-english/challenges/greetings-1.json b/apps/web/src/courses/basque-from-english/challenges/greetings-1.json index babcfbb1efe2..c12cb6928e36 100644 --- a/apps/web/src/courses/basque-from-english/challenges/greetings-1.json +++ b/apps/web/src/courses/basque-from-english/challenges/greetings-1.json @@ -255,6 +255,12 @@ "eta", "Joseba", "gara" + ], + [ + "Mikel", + "eta", + "Joseba", + "gara" ] ], "formattedSolution": "Gu Mikel eta Joseba gara.", @@ -363,6 +369,12 @@ "Gu", "ondo", "gara" + ], + [ + "Eskerrik", + "asko", + "Ondo", + "gara" ] ], "formattedSolution": "Eskerrik asko. Gu ondo gara.", @@ -471,6 +483,12 @@ "eta", "Miren", "dira" + ], + [ + "Mikel", + "eta", + "Miren", + "dira" ] ], "formattedSolution": "Haiek Mikel eta Miren dira?", @@ -568,11 +586,11 @@ "al", "Mikel", "zara", + "Al", "a", "l", "da", - "r", - "zu" + "r" ], "solutions": [ [ @@ -582,6 +600,13 @@ "al", "Mikel", "zara" + ], + [ + "Arratsalde", + "on", + "Al", + "Mikel", + "zara" ] ], "formattedSolution": "Arratsalde on. Zu al Mikel zara?", @@ -680,6 +705,10 @@ "Zu", "ondo", "zara" + ], + [ + "Ondo", + "zara" ] ], "formattedSolution": "Zu ondo zara?", @@ -767,6 +796,11 @@ "Ni", "ondo", "naiz" + ], + [ + "Bai", + "Ondo", + "naiz" ] ], "formattedSolution": "Bai. Ni ondo naiz.", @@ -874,6 +908,12 @@ "ere", "berdin", "naiz" + ], + [ + "Bai", + "Ere", + "berdin", + "naiz" ] ], "formattedSolution": "Bai. Ni ere berdin naiz.", @@ -970,7 +1010,7 @@ "da", "a", "l", - "Ni" + "Al" ], "solutions": [ [ @@ -978,6 +1018,11 @@ "al", "Mikel", "da" + ], + [ + "Al", + "Mikel", + "da" ] ], "formattedSolution": "Hura al Mikel da?", @@ -1069,6 +1114,11 @@ "Hura", "Mikel", "da" + ], + [ + "Bai", + "Mikel", + "da" ] ], "formattedSolution": "Bai. Hura Mikel da.", diff --git a/apps/web/src/courses/basque-from-english/challenges/greetings-2.json b/apps/web/src/courses/basque-from-english/challenges/greetings-2.json index 43bc18614b5b..b256b5f1aeea 100644 --- a/apps/web/src/courses/basque-from-english/challenges/greetings-2.json +++ b/apps/web/src/courses/basque-from-english/challenges/greetings-2.json @@ -575,6 +575,12 @@ "Barkatu", "Berandu", "naiz" + ], + [ + "Barkatu", + "Ni", + "berandu", + "naiz" ] ], "formattedSolution": "Barkatu. Berandu naiz.", @@ -749,6 +755,12 @@ "Epa", "Berandu", "naiz" + ], + [ + "Epa", + "Ni", + "berandu", + "naiz" ] ], "formattedSolution": "Epa. Berandu naiz?", diff --git a/apps/web/src/courses/basque-from-english/challenges/noren-3.json b/apps/web/src/courses/basque-from-english/challenges/noren-3.json index 3f80abc3322c..bd5bd38107e6 100644 --- a/apps/web/src/courses/basque-from-english/challenges/noren-3.json +++ b/apps/web/src/courses/basque-from-english/challenges/noren-3.json @@ -651,6 +651,11 @@ "Mirenen", "laguna", "zara" + ], + [ + "Mirenen", + "laguna", + "zara" ] ], "formattedSolution": "Zu Mirenen laguna zara?", @@ -760,6 +765,12 @@ "Mirenen", "lagun", "naiz" + ], + [ + "Bai", + "Mirenen", + "lagun", + "naiz" ] ], "formattedSolution": "Bai, ni Mirenen lagun naiz.", diff --git a/apps/web/src/courses/basque-from-english/challenges/numbers-and-math-1.json b/apps/web/src/courses/basque-from-english/challenges/numbers-and-math-1.json index 9bc2be2f51b7..0af16cf20b37 100644 --- a/apps/web/src/courses/basque-from-english/challenges/numbers-and-math-1.json +++ b/apps/web/src/courses/basque-from-english/challenges/numbers-and-math-1.json @@ -175,10 +175,10 @@ "euro", "da", "Zu", - "u", "Gu", "ona", - "bat" + "bat", + "Hura" ], "solutions": [ [ @@ -539,6 +539,37 @@ "Mutil", "bat", "naiz" + ], + [ + "Arratsalde", + "on", + "Ni", + "Aitor", + "naiz", + "Ni", + "mutil", + "bat", + "naiz" + ], + [ + "Arratsalde", + "on", + "Aitor", + "naiz", + "Ni", + "mutil", + "bat", + "naiz" + ], + [ + "Arratsalde", + "on", + "Ni", + "Aitor", + "naiz", + "Mutil", + "bat", + "naiz" ] ], "formattedSolution": "Arratsalde on. Aitor naiz. Mutil bat naiz.", @@ -2000,22 +2031,22 @@ { "type": "cards", "pictures": [ - "one1.jpg", - "one2.jpg", - "one3.jpg" + "euro1.jpg", + "euro2.jpg", + "euro3.jpg" ], "formInTargetLanguage": "euro", "meaningInSourceLanguage": "euro", - "id": "7bf27d7f7ae2", + "id": "52b398056859", "priority": 0, - "group": "5b09d38e0f05" + "group": "3abd5c2f6362" }, { "type": "shortInput", "pictures": [ - "one1.jpg", - "one2.jpg", - "one3.jpg" + "euro1.jpg", + "euro2.jpg", + "euro3.jpg" ], "formInTargetLanguage": [ "euro" @@ -2026,9 +2057,9 @@ "definition": "euro" } ], - "id": "4a5f1e8241da", + "id": "a1bfd92ba0fe", "priority": 1, - "group": "5b09d38e0f05" + "group": "3abd5c2f6362" }, { "type": "cards", diff --git a/apps/web/src/courses/basque-from-english/challenges/numbers-and-math-2.json b/apps/web/src/courses/basque-from-english/challenges/numbers-and-math-2.json index bfa9f19b7fb9..460dc7be8a05 100644 --- a/apps/web/src/courses/basque-from-english/challenges/numbers-and-math-2.json +++ b/apps/web/src/courses/basque-from-english/challenges/numbers-and-math-2.json @@ -290,6 +290,11 @@ "hamar", "etxekoandre", "gara" + ], + [ + "Hamar", + "etxekoandre", + "gara" ] ], "formattedSolution": "Gu hamar etxekoandre gara.", diff --git a/apps/web/src/courses/basque-from-english/challenges/numbers-and-math-3.json b/apps/web/src/courses/basque-from-english/challenges/numbers-and-math-3.json index 61305ca6cd51..906f696f76c2 100644 --- a/apps/web/src/courses/basque-from-english/challenges/numbers-and-math-3.json +++ b/apps/web/src/courses/basque-from-english/challenges/numbers-and-math-3.json @@ -293,12 +293,17 @@ "Hamabi", "gara", "zara", - "Hura" + "hamabi" ], "solutions": [ [ "Hamabi", "gara" + ], + [ + "Gu", + "hamabi", + "gara" ] ], "formattedSolution": "Hamabi gara.", diff --git a/apps/web/src/courses/basque-from-english/challenges/people-and-past-1.json b/apps/web/src/courses/basque-from-english/challenges/people-and-past-1.json index 56ed3dc061fc..5f864c1849b4 100644 --- a/apps/web/src/courses/basque-from-english/challenges/people-and-past-1.json +++ b/apps/web/src/courses/basque-from-english/challenges/people-and-past-1.json @@ -166,6 +166,11 @@ "autobus", "gidaria", "da" + ], + [ + "Autobus", + "gidaria", + "da" ] ], "formattedSolution": "Hura autobus gidaria da.", @@ -420,8 +425,8 @@ "gida", "naiz", "da", - "ona", "ni", + "ona", "a", "i" ], @@ -433,6 +438,13 @@ "tour", "gida", "naiz" + ], + [ + "Arratsalde", + "on", + "Tour", + "gida", + "naiz" ] ], "formattedSolution": "Arratsalde on. Ni tour gida naiz.", @@ -546,6 +558,10 @@ "Haiek", "turistak", "dira" + ], + [ + "Turistak", + "dira" ] ], "formattedSolution": "Haiek turistak dira.", @@ -650,6 +666,12 @@ "ere", "erizaina", "naiz" + ], + [ + "Kaixo", + "Ere", + "erizaina", + "naiz" ] ], "formattedSolution": "Kaixo. Ni ere erizaina naiz.", @@ -757,8 +779,8 @@ "zu", "da", "a", - "u", - "Gu" + "Gu", + "n" ], "solutions": [ [ @@ -768,6 +790,13 @@ "al", "medikua", "zara" + ], + [ + "Egun", + "on", + "Al", + "medikua", + "zara" ] ], "formattedSolution": "Egun on. Zu al medikua zara?", @@ -884,6 +913,11 @@ "Gu", "ikasleak", "gara" + ], + [ + "Epa", + "Ikasleak", + "gara" ] ], "formattedSolution": "Epa. Gu ikasleak gara.", @@ -996,6 +1030,11 @@ "Gu", "gidariak", "gara" + ], + [ + "Bai", + "Gidariak", + "gara" ] ], "formattedSolution": "Bai. Gu gidariak gara.", @@ -1108,6 +1147,11 @@ "Gu", "medikuak", "gara" + ], + [ + "Bai", + "Medikuak", + "gara" ] ], "formattedSolution": "Bai. Gu medikuak gara.", @@ -1213,6 +1257,10 @@ "Zuek", "turistak", "zarete" + ], + [ + "Turistak", + "zarete" ] ], "formattedSolution": "Zuek turistak zarete.", @@ -1310,6 +1358,11 @@ "al", "poliziak", "zarete" + ], + [ + "Al", + "poliziak", + "zarete" ] ], "formattedSolution": "Zuek al poliziak zarete?", @@ -1395,11 +1448,11 @@ }, { "type": "options", - "formInTargetLanguage": "Hura al polizia bat da.", + "formInTargetLanguage": "Hura al polizia bat da?", "meaningInSourceLanguage": "Is he a police officer?", - "id": "ed9b4a98b87b", + "id": "b7f8232653d8", "priority": 0, - "group": "cac10769d8f1" + "group": "85fa10080b8d" }, { "type": "chips", @@ -1434,8 +1487,8 @@ "da", "a", "l", - "Bai", - "ona" + "Al", + "Bai" ], "solutions": [ [ @@ -1444,12 +1497,29 @@ "polizia", "bat", "da" + ], + [ + "Al", + "polizia", + "bat", + "da" + ], + [ + "Hura", + "al", + "polizia", + "da" + ], + [ + "Al", + "polizia", + "da" ] ], - "formattedSolution": "Hura al polizia bat da.", - "id": "83370806262d", + "formattedSolution": "Hura al polizia bat da?", + "id": "ed2722570d8b", "priority": 2, - "group": "cac10769d8f1" + "group": "85fa10080b8d" }, { "type": "chips", @@ -1472,7 +1542,7 @@ "definition": "one" }, { - "word": "da.", + "word": "da?", "definition": "he is (izan)\nis\nit is (izan)\nshe is (izan)" } ], @@ -1515,12 +1585,26 @@ "the", "police", "officer" + ], + [ + "Is", + "he", + "one", + "police", + "officer" + ], + [ + "Is", + "she", + "one", + "police", + "officer" ] ], "formattedSolution": "Is he a police officer?", - "id": "8b6d31aa4f08", + "id": "6978132690f3", "priority": 2, - "group": "cac10769d8f1" + "group": "85fa10080b8d" }, { "type": "options", @@ -1573,6 +1657,12 @@ "edo", "medikuak", "dira" + ], + [ + "Erizainak", + "edo", + "medikuak", + "dira" ] ], "formattedSolution": "Haiek erizainak edo medikuak dira?", diff --git a/apps/web/src/courses/basque-from-english/challenges/people-and-past-2.json b/apps/web/src/courses/basque-from-english/challenges/people-and-past-2.json index 2f83e8ca8418..fa7ffc2efb63 100644 --- a/apps/web/src/courses/basque-from-english/challenges/people-and-past-2.json +++ b/apps/web/src/courses/basque-from-english/challenges/people-and-past-2.json @@ -79,6 +79,33 @@ "orain", "irakaslea", "naiz" + ], + [ + "Ni", + "ikaslea", + "nintzen", + "baina", + "orain", + "ni", + "irakaslea", + "naiz" + ], + [ + "Ikaslea", + "nintzen", + "baina", + "orain", + "ni", + "irakaslea", + "naiz" + ], + [ + "Ikaslea", + "nintzen", + "baina", + "orain", + "irakaslea", + "naiz" ] ], "formattedSolution": "Ni ikaslea nintzen, baina orain irakaslea naiz.", @@ -243,6 +270,36 @@ "tour", "gida", "naiz" + ], + [ + "Ni", + "turista", + "nintzen", + "baina", + "orain", + "ni", + "tour", + "gida", + "naiz" + ], + [ + "Turista", + "nintzen", + "baina", + "orain", + "ni", + "tour", + "gida", + "naiz" + ], + [ + "Turista", + "nintzen", + "baina", + "orain", + "tour", + "gida", + "naiz" ] ], "formattedSolution": "Ni turista nintzen, baina orain tour gida naiz.", @@ -407,6 +464,33 @@ "orain", "irakaslea", "zara" + ], + [ + "Zu", + "gidaria", + "zinen", + "baina", + "orain", + "zu", + "irakaslea", + "zara" + ], + [ + "Gidaria", + "zinen", + "baina", + "orain", + "zu", + "irakaslea", + "zara" + ], + [ + "Gidaria", + "zinen", + "baina", + "orain", + "irakaslea", + "zara" ] ], "formattedSolution": "Zu gidaria zinen, baina orain irakaslea zara.", @@ -564,6 +648,33 @@ "orain", "emakume", "zara" + ], + [ + "Zu", + "neska", + "zinen", + "baina", + "orain", + "zu", + "emakume", + "zara" + ], + [ + "Neska", + "zinen", + "baina", + "orain", + "zu", + "emakume", + "zara" + ], + [ + "Neska", + "zinen", + "baina", + "orain", + "emakume", + "zara" ] ], "formattedSolution": "Zu neska zinen, baina orain emakume zara.", @@ -721,6 +832,33 @@ "orain", "erizaina", "da" + ], + [ + "Hura", + "irakaslea", + "zen", + "baina", + "orain", + "hura", + "erizaina", + "da" + ], + [ + "Irakaslea", + "zen", + "baina", + "orain", + "hura", + "erizaina", + "da" + ], + [ + "Irakaslea", + "zen", + "baina", + "orain", + "erizaina", + "da" ] ], "formattedSolution": "Hura irakaslea zen, baina orain erizaina da.", @@ -901,6 +1039,36 @@ "tour", "gida", "da" + ], + [ + "Hura", + "polizia", + "zen", + "baina", + "orain", + "hura", + "tour", + "gida", + "da" + ], + [ + "Polizia", + "zen", + "baina", + "orain", + "hura", + "tour", + "gida", + "da" + ], + [ + "Polizia", + "zen", + "baina", + "orain", + "tour", + "gida", + "da" ] ], "formattedSolution": "Hura polizia zen, baina orain tour gida da.", @@ -1071,6 +1239,30 @@ "baina", "gizonak", "gara" + ], + [ + "Gu", + "mutilak", + "ginen", + "baina", + "gu", + "gizonak", + "gara" + ], + [ + "Mutilak", + "ginen", + "baina", + "gu", + "gizonak", + "gara" + ], + [ + "Mutilak", + "ginen", + "baina", + "gizonak", + "gara" ] ], "formattedSolution": "Gu mutilak ginen, baina gizonak gara.", @@ -1210,6 +1402,33 @@ "orain", "ikasleak", "gara" + ], + [ + "Gu", + "turistak", + "ginen", + "baina", + "orain", + "gu", + "ikasleak", + "gara" + ], + [ + "Turistak", + "ginen", + "baina", + "orain", + "gu", + "ikasleak", + "gara" + ], + [ + "Turistak", + "ginen", + "baina", + "orain", + "ikasleak", + "gara" ] ], "formattedSolution": "Gu turistak ginen, baina orain ikasleak gara.", @@ -1353,6 +1572,33 @@ "orain", "turistak", "dira" + ], + [ + "Zuek", + "medikuak", + "zineten", + "baina", + "orain", + "zuek", + "turistak", + "dira" + ], + [ + "Medikuak", + "zineten", + "baina", + "orain", + "zuek", + "turistak", + "dira" + ], + [ + "Medikuak", + "zineten", + "baina", + "orain", + "turistak", + "dira" ] ], "formattedSolution": "Zuek medikuak zineten, baina orain turistak dira.", @@ -1516,6 +1762,33 @@ "orain", "medikuak", "zarete" + ], + [ + "Zuek", + "ikasleak", + "zineten", + "baina", + "orain", + "zuek", + "medikuak", + "zarete" + ], + [ + "Ikasleak", + "zineten", + "baina", + "orain", + "zuek", + "medikuak", + "zarete" + ], + [ + "Ikasleak", + "zineten", + "baina", + "orain", + "medikuak", + "zarete" ] ], "formattedSolution": "Zuek ikasleak zineten, baina orain medikuak zarete.", @@ -1679,6 +1952,33 @@ "orain", "erizainak", "dira" + ], + [ + "Haiek", + "ikasleak", + "ziren", + "baina", + "orain", + "haiek", + "erizainak", + "dira" + ], + [ + "Ikasleak", + "ziren", + "baina", + "orain", + "haiek", + "erizainak", + "dira" + ], + [ + "Ikasleak", + "ziren", + "baina", + "orain", + "erizainak", + "dira" ] ], "formattedSolution": "Haiek ikasleak ziren, baina orain erizainak dira.", @@ -1831,6 +2131,33 @@ "orain", "ikasleak", "dira" + ], + [ + "Haiek", + "gidariak", + "ziren", + "baina", + "orain", + "haiek", + "ikasleak", + "dira" + ], + [ + "Gidariak", + "ziren", + "baina", + "orain", + "haiek", + "ikasleak", + "dira" + ], + [ + "Gidariak", + "ziren", + "baina", + "orain", + "ikasleak", + "dira" ] ], "formattedSolution": "Haiek gidariak ziren, baina orain ikasleak dira.", diff --git a/apps/web/src/courses/basque-from-english/challenges/people-and-past-3.json b/apps/web/src/courses/basque-from-english/challenges/people-and-past-3.json index 690194af2da8..6329f515f4ab 100644 --- a/apps/web/src/courses/basque-from-english/challenges/people-and-past-3.json +++ b/apps/web/src/courses/basque-from-english/challenges/people-and-past-3.json @@ -63,8 +63,8 @@ "orain", "etxekoandrea", "naiz", - "ona", "ni", + "ona", "nire", "nirea", "Zein", @@ -79,6 +79,33 @@ "orain", "etxekoandrea", "naiz" + ], + [ + "Ni", + "neska", + "nintzen", + "baina", + "orain", + "ni", + "etxekoandrea", + "naiz" + ], + [ + "Neska", + "nintzen", + "baina", + "orain", + "ni", + "etxekoandrea", + "naiz" + ], + [ + "Neska", + "nintzen", + "baina", + "orain", + "etxekoandrea", + "naiz" ] ], "formattedSolution": "Ni neska nintzen, baina orain etxekoandrea naiz.", @@ -236,6 +263,33 @@ "orain", "apaiza", "naiz" + ], + [ + "Ni", + "ikaslea", + "nintzen", + "baina", + "orain", + "ni", + "apaiza", + "naiz" + ], + [ + "Ikaslea", + "nintzen", + "baina", + "orain", + "ni", + "apaiza", + "naiz" + ], + [ + "Ikaslea", + "nintzen", + "baina", + "orain", + "apaiza", + "naiz" ] ], "formattedSolution": "Ni ikaslea nintzen, baina orain apaiza naiz.", @@ -318,11 +372,11 @@ }, { "type": "options", - "formInTargetLanguage": "Camareroa zinen, baina orain irakaslea zara.", + "formInTargetLanguage": "Zu camareroa zinen, baina orain irakaslea zara.", "meaningInSourceLanguage": "You were a waiter, but now you are a teacher.", - "id": "9ae2aab20ec8", + "id": "5ace332098d8", "priority": 0, - "group": "eb35b51edcbb" + "group": "e37dd0c8e579" }, { "type": "chips", @@ -370,19 +424,49 @@ } ], "chips": [ - "Camareroa", + "Zu", + "camareroa", "zinen", "baina", "orain", "irakaslea", "zara", "gara", - "ibaia", "dira", - "ziren", - "morea" + "zurea", + "jaka", + "ibaia", + "zen" ], "solutions": [ + [ + "Zu", + "camareroa", + "zinen", + "baina", + "orain", + "irakaslea", + "zara" + ], + [ + "Zu", + "camareroa", + "zinen", + "baina", + "orain", + "zu", + "irakaslea", + "zara" + ], + [ + "Camareroa", + "zinen", + "baina", + "orain", + "zu", + "irakaslea", + "zara" + ], [ "Camareroa", "zinen", @@ -392,17 +476,21 @@ "zara" ] ], - "formattedSolution": "Camareroa zinen, baina orain irakaslea zara.", - "id": "eb2d31853a2d", + "formattedSolution": "Zu camareroa zinen, baina orain irakaslea zara.", + "id": "3da970ba2bf3", "priority": 2, - "group": "eb35b51edcbb" + "group": "e37dd0c8e579" }, { "type": "chips", "translatesToSourceLanguage": true, "phrase": [ { - "word": "Camareroa", + "word": "Zu", + "definition": "you" + }, + { + "word": "camareroa", "definition": "the waiter\nwaiter" }, { @@ -462,9 +550,9 @@ ] ], "formattedSolution": "You were a waiter, but now you are a teacher.", - "id": "69dd82ac9d95", + "id": "caae44d67a20", "priority": 2, - "group": "eb35b51edcbb" + "group": "e37dd0c8e579" }, { "type": "options", @@ -543,6 +631,33 @@ "orain", "laguna", "zara" + ], + [ + "Zu", + "arrotza", + "zinen", + "baina", + "orain", + "zu", + "laguna", + "zara" + ], + [ + "Arrotza", + "zinen", + "baina", + "orain", + "zu", + "laguna", + "zara" + ], + [ + "Arrotza", + "zinen", + "baina", + "orain", + "laguna", + "zara" ] ], "formattedSolution": "Zu arrotza zinen, baina orain laguna zara.", @@ -700,6 +815,33 @@ "orain", "sukaldaria", "da" + ], + [ + "Hura", + "gidaria", + "zen", + "baina", + "orain", + "hura", + "sukaldaria", + "da" + ], + [ + "Gidaria", + "zen", + "baina", + "orain", + "hura", + "sukaldaria", + "da" + ], + [ + "Gidaria", + "zen", + "baina", + "orain", + "sukaldaria", + "da" ] ], "formattedSolution": "Hura gidaria zen, baina orain sukaldaria da.", @@ -893,6 +1035,33 @@ "orain", "medikua", "da" + ], + [ + "Hura", + "sukaldaria", + "zen", + "baina", + "orain", + "hura", + "medikua", + "da" + ], + [ + "Sukaldaria", + "zen", + "baina", + "orain", + "hura", + "medikua", + "da" + ], + [ + "Sukaldaria", + "zen", + "baina", + "orain", + "medikua", + "da" ] ], "formattedSolution": "Hura sukaldaria zen, baina orain medikua da.", @@ -1078,6 +1247,33 @@ "orain", "arrotzak", "gara" + ], + [ + "Gu", + "lagunak", + "ginen", + "baina", + "orain", + "gu", + "arrotzak", + "gara" + ], + [ + "Lagunak", + "ginen", + "baina", + "orain", + "gu", + "arrotzak", + "gara" + ], + [ + "Lagunak", + "ginen", + "baina", + "orain", + "arrotzak", + "gara" ] ], "formattedSolution": "Gu lagunak ginen, baina orain arrotzak gara.", @@ -1234,6 +1430,33 @@ "orain", "poliziak", "gara" + ], + [ + "Gu", + "camareroak", + "ginen", + "baina", + "orain", + "gu", + "poliziak", + "gara" + ], + [ + "Camareroak", + "ginen", + "baina", + "orain", + "gu", + "poliziak", + "gara" + ], + [ + "Camareroak", + "ginen", + "baina", + "orain", + "poliziak", + "gara" ] ], "formattedSolution": "Gu camareroak ginen, baina orain poliziak gara.", @@ -1390,6 +1613,33 @@ "orain", "apaizak", "zara" + ], + [ + "Zuek", + "turistak", + "zineten", + "baina", + "orain", + "zuek", + "apaizak", + "zara" + ], + [ + "Turistak", + "zineten", + "baina", + "orain", + "zuek", + "apaizak", + "zara" + ], + [ + "Turistak", + "zineten", + "baina", + "orain", + "apaizak", + "zara" ] ], "formattedSolution": "Zuek turistak zineten, baina orain apaizak zara.", @@ -1562,6 +1812,33 @@ "orain", "lagunak", "zara" + ], + [ + "Zuek", + "arrotzak", + "zineten", + "baina", + "orain", + "zuek", + "lagunak", + "zara" + ], + [ + "Arrotzak", + "zineten", + "baina", + "orain", + "zuek", + "lagunak", + "zara" + ], + [ + "Arrotzak", + "zineten", + "baina", + "orain", + "lagunak", + "zara" ] ], "formattedSolution": "Zuek arrotzak zineten, baina orain lagunak zara.", @@ -1734,6 +2011,33 @@ "orain", "etxekoandreak", "dira" + ], + [ + "Haiek", + "erizainak", + "ziren", + "baina", + "orain", + "haiek", + "etxekoandreak", + "dira" + ], + [ + "Erizainak", + "ziren", + "baina", + "orain", + "haiek", + "etxekoandreak", + "dira" + ], + [ + "Erizainak", + "ziren", + "baina", + "orain", + "etxekoandreak", + "dira" ] ], "formattedSolution": "Haiek erizainak ziren, baina orain etxekoandreak dira.", @@ -1886,6 +2190,33 @@ "orain", "apaizak", "dira" + ], + [ + "Haiek", + "mutilak", + "ziren", + "baina", + "orain", + "haiek", + "apaizak", + "dira" + ], + [ + "Mutilak", + "ziren", + "baina", + "orain", + "haiek", + "apaizak", + "dira" + ], + [ + "Mutilak", + "ziren", + "baina", + "orain", + "apaizak", + "dira" ] ], "formattedSolution": "Haiek mutilak ziren, baina orain apaizak dira.", diff --git a/apps/web/src/courses/basque-from-english/challenges/questions.json b/apps/web/src/courses/basque-from-english/challenges/questions.json index 4827360265e5..15edee36d8dc 100644 --- a/apps/web/src/courses/basque-from-english/challenges/questions.json +++ b/apps/web/src/courses/basque-from-english/challenges/questions.json @@ -226,6 +226,11 @@ "al", "zara", "irakaslea" + ], + [ + "Al", + "zara", + "irakaslea" ] ], "formattedSolution": "Zu al zara irakaslea?", @@ -341,6 +346,12 @@ "edo", "ikaslea", "zara" + ], + [ + "Irakaslea", + "edo", + "ikaslea", + "zara" ] ], "formattedSolution": "Zu irakaslea edo ikaslea zara?", @@ -629,6 +640,10 @@ "Hura", "neska", "da" + ], + [ + "Neska", + "da" ] ], "formattedSolution": "Hura neska da?", @@ -722,6 +737,10 @@ "Hura", "mutila", "da" + ], + [ + "Mutila", + "da" ] ], "formattedSolution": "Hura mutila da?", @@ -810,7 +829,7 @@ "da", "a", "Zu", - "u" + "Gu" ], "solutions": [ [ @@ -818,6 +837,11 @@ "al", "autobusa", "da" + ], + [ + "Al", + "autobusa", + "da" ] ], "formattedSolution": "Hura al autobusa da?", @@ -1041,6 +1065,12 @@ "edo", "kotxea", "da" + ], + [ + "Autobusa", + "edo", + "kotxea", + "da" ] ], "formattedSolution": "Hura autobusa edo kotxea da?", @@ -1150,6 +1180,10 @@ "Nortzuk", "gara", "gu" + ], + [ + "Nortzuk", + "gara" ] ], "formattedSolution": "Nortzuk gara gu?", @@ -1230,6 +1264,10 @@ "Zer", "gara", "gu" + ], + [ + "Zer", + "gara" ] ], "formattedSolution": "Zer gara gu?", @@ -1310,6 +1348,10 @@ "Nortzuk", "zarete", "zuek" + ], + [ + "Nortzuk", + "zarete" ] ], "formattedSolution": "Nortzuk zarete zuek?", @@ -1480,6 +1522,10 @@ "Zer", "dira", "haiek" + ], + [ + "Zer", + "dira" ] ], "formattedSolution": "Zer dira haiek?", @@ -1563,6 +1609,11 @@ "al", "autobusak", "dira" + ], + [ + "Al", + "autobusak", + "dira" ] ], "formattedSolution": "Haiek al autobusak dira?", @@ -1661,6 +1712,12 @@ "edo", "kotxeak", "dira" + ], + [ + "Autobusak", + "edo", + "kotxeak", + "dira" ] ], "formattedSolution": "Haiek autobusak edo kotxeak dira?", @@ -1764,6 +1821,10 @@ "Zer", "zarete", "zuek" + ], + [ + "Zer", + "zarete" ] ], "formattedSolution": "Zer zarete zuek?", @@ -1857,6 +1918,11 @@ "al", "zarete", "irakasleak" + ], + [ + "Al", + "zarete", + "irakasleak" ] ], "formattedSolution": "Zuek al zarete irakasleak?", @@ -2212,6 +2278,10 @@ "Nortzuk", "dira", "haiek" + ], + [ + "Nortzuk", + "dira" ] ], "formattedSolution": "Nortzuk dira haiek?", @@ -2306,6 +2376,12 @@ "edo", "gizonak", "dira" + ], + [ + "Emakumeak", + "edo", + "gizonak", + "dira" ] ], "formattedSolution": "Haiek emakumeak edo gizonak dira?", diff --git a/apps/web/src/courses/basque-from-english/challenges/this-that-and-my-2.json b/apps/web/src/courses/basque-from-english/challenges/this-that-and-my-2.json index 1c945f2bfa4c..41598491627a 100644 --- a/apps/web/src/courses/basque-from-english/challenges/this-that-and-my-2.json +++ b/apps/web/src/courses/basque-from-english/challenges/this-that-and-my-2.json @@ -46,6 +46,11 @@ "nire", "irakaslea", "da" + ], + [ + "Nire", + "irakaslea", + "da" ] ], "formattedSolution": "Hura nire irakaslea da.", @@ -146,6 +151,11 @@ "nire", "zaldiak", "dira" + ], + [ + "Nire", + "zaldiak", + "dira" ] ], "formattedSolution": "Haiek nire zaldiak dira.", @@ -247,6 +257,12 @@ "nire", "irakaslea", "da" + ], + [ + "Ere", + "nire", + "irakaslea", + "da" ] ], "formattedSolution": "Hura ere nire irakaslea da.", @@ -449,6 +465,11 @@ "zuen", "ikasleak", "gara" + ], + [ + "Zuen", + "ikasleak", + "gara" ] ], "formattedSolution": "Gu zuen ikasleak gara.", @@ -644,6 +665,11 @@ "zure", "irakaslea", "naiz" + ], + [ + "Zure", + "irakaslea", + "naiz" ] ], "formattedSolution": "Ni zure irakaslea naiz.", @@ -745,6 +771,12 @@ "bere", "erizaina", "naiz" + ], + [ + "Bai", + "Bere", + "erizaina", + "naiz" ] ], "formattedSolution": "Bai. Ni bere erizaina naiz", @@ -853,6 +885,11 @@ "bere", "ikasleak", "gara" + ], + [ + "Bere", + "ikasleak", + "gara" ] ], "formattedSolution": "Gu bere ikasleak gara?", @@ -960,6 +997,12 @@ "autobus", "gidaria", "da" + ], + [ + "Gure", + "autobus", + "gidaria", + "da" ] ], "formattedSolution": "Hura gure autobus gidaria da.", @@ -1068,6 +1111,11 @@ "gure", "gidariak", "zarete" + ], + [ + "Gure", + "gidariak", + "zarete" ] ], "formattedSolution": "Zuek gure gidariak zarete?", @@ -1174,6 +1222,11 @@ "zuen", "irakasleak", "dira" + ], + [ + "Zuen", + "irakasleak", + "dira" ] ], "formattedSolution": "Haiek zuen irakasleak dira.", @@ -1374,6 +1427,11 @@ "zuen", "laguna", "dira" + ], + [ + "Zuen", + "laguna", + "dira" ] ], "formattedSolution": "Hura zuen laguna dira.", @@ -1498,6 +1556,11 @@ "haien", "gidaria", "zara" + ], + [ + "Haien", + "gidaria", + "zara" ] ], "formattedSolution": "Zu haien gidaria zara?", @@ -1599,6 +1662,12 @@ "haien", "medikua", "naiz" + ], + [ + "Bai", + "Haien", + "medikua", + "naiz" ] ], "formattedSolution": "Bai. Ni haien medikua naiz.", diff --git a/apps/web/src/courses/basque-from-english/courseData.json b/apps/web/src/courses/basque-from-english/courseData.json index 54e4f5455aad..15f6b0c8f440 100644 --- a/apps/web/src/courses/basque-from-english/courseData.json +++ b/apps/web/src/courses/basque-from-english/courseData.json @@ -238,7 +238,7 @@ "Bai. Gu medikuak gara.", "Zuek turistak zarete.", "Zuek al poliziak zarete?", - "Hura al polizia bat da.", + "Hura al polizia bat da?", "Haiek erizainak edo medikuak dira?" ], "practiceHref": "people-and-past-1", @@ -286,7 +286,7 @@ "arrotz", "Ni neska nintzen, baina orain etxekoandrea naiz.", "Ni ikaslea nintzen, baina orain apaiza naiz.", - "Camareroa zinen, baina orain irakaslea zara.", + "Zu camareroa zinen, baina orain irakaslea zara.", "Zu arrotza zinen, baina orain laguna zara.", "Hura gidaria zen, baina orain sukaldaria da.", "Hura sukaldaria zen, baina orain medikua da.", @@ -362,8 +362,8 @@ "Ez zen denda, baizik etxe bat zen.", "Ez da denda gorria, baizik denda berdea.", "Dendak ez ziren zuriak, baina berdeak.", - "Hura ez da medikua, baina medikua zen.", - "Hura ez zen ikaslea, baina irakaslea nintzen.", + "Hura ez da medikua, baina ni medikua zen.", + "Hura ez zen ikaslea, baina ni irakaslea nintzen.", "Zu ez zara polizia.", "Gu ez ginen medikuak, baizik erizainak.", "Zuek ez zineten turistak." @@ -422,7 +422,7 @@ "Erizaina polita da eta medikua ederra.", "Ikaslea polita da, baina gidaria itsusia da.", "Tour gida polita da, baina turista ederra da.", - "Medikua ez da itsusia, baizik ederra da", + "Medikua ez da itsusia, baizik ederra da.", "Polizia gizon gaztea eta ederra da.", "Emakume gazteak eta politak dira.", "Gidaria ez da ederra.", @@ -909,7 +909,7 @@ "kanpo", "barruan", "Arratsalde on. Non zaude zu?", - "Ni etxean nago", + "Ni etxean nago.", "Barkatu. Non nago?", "Egun on. Gure ostatuan zaude.", "Non dago etxekoandrea?", diff --git a/apps/web/src/courses/basque-from-english/introduction/egon-2.md b/apps/web/src/courses/basque-from-english/introduction/egon-2.md index f4eb4d44c350..080fb269c2a9 100644 --- a/apps/web/src/courses/basque-from-english/introduction/egon-2.md +++ b/apps/web/src/courses/basque-from-english/introduction/egon-2.md @@ -14,19 +14,6 @@ * Note that the word Herri can mean different things (town, village, region) depending on context. * In this lesson you will see the term Euskal Herrian: Basque Country, a name you should learn. -### Vocabulary Egon 1 - -* Ni nago: I am -* Zu zaude: You are -* Hura dago: He/she/it is -* Gu gaude: We are -* Zuek zaudete: You (plural) are -* Haiek daude: They are -* zuhaitz: tree -* non: where -* kanpo: outside -* barruan: inside - ### Vocabulary Egon 2 * Madril: Madrid diff --git a/apps/web/src/courses/french-from-english/challenges/hello.json b/apps/web/src/courses/french-from-english/challenges/hello.json index 06e4a5e4b2fc..40e311f93fa7 100644 --- a/apps/web/src/courses/french-from-english/challenges/hello.json +++ b/apps/web/src/courses/french-from-english/challenges/hello.json @@ -277,9 +277,9 @@ ], "formInTargetLanguage": "la femme", "meaningInSourceLanguage": "the woman", - "id": "bd13dcfe4d22", + "id": "651c2dd5fa6b", "priority": 0, - "group": "2729f22db5bf" + "group": "1bde49515308" }, { "type": "shortInput", @@ -302,18 +302,18 @@ "definition": "femme" } ], - "id": "19a877a0955d", + "id": "114d8d76f27c", "priority": 1, - "group": "2729f22db5bf" + "group": "1bde49515308" }, { "type": "listeningExercise", "answer": "la femme", "meaning": "the woman", "audio": "cabd9d1b9cae7227bd640f6ec302ea9ce0c551e7f94d23a7ff843ced6846c7da", - "id": "f91de23ae173", + "id": "3bddfe2a7b59", "priority": 1, - "group": "2729f22db5bf" + "group": "1bde49515308" } ] } \ No newline at end of file diff --git a/apps/web/src/courses/german-from-english/challenges/hello.json b/apps/web/src/courses/german-from-english/challenges/hello.json index 59d65975705d..e7a6439de86c 100644 --- a/apps/web/src/courses/german-from-english/challenges/hello.json +++ b/apps/web/src/courses/german-from-english/challenges/hello.json @@ -299,9 +299,9 @@ ], "formInTargetLanguage": "Die Frau", "meaningInSourceLanguage": "the woman", - "id": "840d90aea650", + "id": "9d443b55991d", "priority": 0, - "group": "2d6a9b3b659b" + "group": "4dac263441d4" }, { "type": "shortInput", @@ -324,18 +324,18 @@ "definition": "Frau" } ], - "id": "5cd545eaebe8", + "id": "63159fbbcc61", "priority": 1, - "group": "2d6a9b3b659b" + "group": "4dac263441d4" }, { "type": "listeningExercise", "answer": "Die Frau", "meaning": "the woman", "audio": "609a9b428b8d731096abd531a6a40d22f5bf8d9155b5113185fc99286e83cae4", - "id": "70dd782a5072", + "id": "4bad498bcd58", "priority": 1, - "group": "2d6a9b3b659b" + "group": "4dac263441d4" } ] } \ No newline at end of file diff --git a/apps/web/src/courses/parsig-from-english/challenges/basic-1.json b/apps/web/src/courses/parsig-from-english/challenges/basic-1.json index c33bb7301ee2..a4f3b89a9390 100644 --- a/apps/web/src/courses/parsig-from-english/challenges/basic-1.json +++ b/apps/web/src/courses/parsig-from-english/challenges/basic-1.json @@ -188,9 +188,9 @@ ], "formInTargetLanguage": "zan", "meaningInSourceLanguage": "woman", - "id": "64cf455940f5", + "id": "7204f2eb86a9", "priority": 0, - "group": "2bc2540ac01c" + "group": "3af214c76662" }, { "type": "shortInput", @@ -208,9 +208,9 @@ "definition": "zan" } ], - "id": "3e2127a2f74a", + "id": "f421937e3cda", "priority": 1, - "group": "2bc2540ac01c" + "group": "3af214c76662" } ] } \ No newline at end of file diff --git a/courses/basque-from-english/01-Basics/skills/01-basics-1.yaml b/courses/basque-from-english/01-Basics/skills/01-basics-1.yaml index 0dc7a739d164..83b5ffc71df9 100644 --- a/courses/basque-from-english/01-Basics/skills/01-basics-1.yaml +++ b/courses/basque-from-english/01-Basics/skills/01-basics-1.yaml @@ -86,39 +86,55 @@ New words: Phrases: - Phrase: Ni gizon bat naiz. + Alternative versions: + - Gizon bat naiz. Translation: I am a man. Alternative translations: - I am one man. - Phrase: Kaixo. Ni Terese naiz. + Alternative versions: + - Kaixo. Terese naiz. Translation: Hello I am Terese. - Phrase: Ni neska bat naiz. + Alternative versions: + - Neska bat naiz. Translation: I am a girl. Alternative translations: - I am one girl. - Phrase: Kaixo, Ni mutil bat naiz. + Alternative versions: + - Kaixo, Mutil bat naiz. Translation: Hello, I am a boy. Alternative translations: - Hello, I am one boy. - Phrase: Zu neska bat zara. + Alternative versions: + - Neska bat zara. Translation: You are a girl. Alternative translations: - You are one girl. - Phrase: Zu emakume bat zara. + Alternative versions: + - Emakume bat zara Translation: You are a woman. Alternative translations: - You are one woman. - Phrase: Zu gizon bat zara. + Alternative versions: + - Gizon bat zara. Translation: You are a man. Alternative translations: - You are one man. - Phrase: Hura Mikel da. + Alternative versions: + - Mikel da. Translation: He is Mikel. - Phrase: Aitor mutil bat da. diff --git a/courses/basque-from-english/01-Basics/skills/01-basics-2.yaml b/courses/basque-from-english/01-Basics/skills/01-basics-2.yaml index e9148abd8e52..2fd8746b8f06 100644 --- a/courses/basque-from-english/01-Basics/skills/01-basics-2.yaml +++ b/courses/basque-from-english/01-Basics/skills/01-basics-2.yaml @@ -114,9 +114,9 @@ Phrases: - Zu Mikel zara. Gizona zara. - Mikel zara. Zu gizona zara. - Mikel zara. Gizona zara. - Translation: You are a Mikel. You are a man. + Translation: You are Mikel. You are a man. Alternative translations: - - You are a Mikel. You are the man. + - You are Mikel. You are the man. - Phrase: Zu Aitor zara. Zu bat ikasle zara. Alternative versions: @@ -125,7 +125,7 @@ Phrases: - Aitor zara. Ikasle zara. Translation: You are Aitor. You are one student. Alternative translations: - - You are a Aitor. You are a student. + - You are Aitor. You are a student. - Phrase: Zu Miren zara. Zu emakumea zara. Alternative versions: @@ -146,7 +146,8 @@ Phrases: - You are Aitor. You are the boy. - Phrase: Hura Miren da. Miren emakumea da. - Alternative versions: Miren da. Miren emakumea da. + Alternative versions: + - Miren da. Miren emakumea da. Translation: She is Miren. Miren is a woman. Alternative translations: She is Miren. Miren is the woman. diff --git a/courses/basque-from-english/02-QuestionsGreetings/skills/02-greetings-1.yaml b/courses/basque-from-english/02-QuestionsGreetings/skills/02-greetings-1.yaml index a80ce0c7a1cc..be262d2d3edf 100644 --- a/courses/basque-from-english/02-QuestionsGreetings/skills/02-greetings-1.yaml +++ b/courses/basque-from-english/02-QuestionsGreetings/skills/02-greetings-1.yaml @@ -80,34 +80,52 @@ Phrases: Translation: Good Morning. How are you? - Phrase: Gu Mikel eta Joseba gara. + Alternative versions: + - Mikel eta Joseba gara. Translation: We are Mikel and Joseba. - Phrase: Eskerrik asko. Gu ondo gara. + Alternative versions: + - Eskerrik asko. Ondo gara. Translation: Thank you. We are fine. - Phrase: Haiek Mikel eta Miren dira? + Alternative versions: + - Mikel eta Miren dira? Translation: Are they Mikel and Miren? - Phrase: Arratsalde on. Zu al Mikel zara? + Alternative versions: + - Arratsalde on. Al Mikel zara? Translation: Good Afternoon. Are you Mikel? - Phrase: Zu ondo zara? + Alternative versions: + - Ondo zara? Translation: Are you OK? - Phrase: Bai. Ni ondo naiz. + Alternative versions: + - Bai. Ondo naiz. Translation: Yes. I am fine. Alternative translations: - Yes. I am OK. - Phrase: Bai. Ni ere berdin naiz. + Alternative versions: + - Bai. Ere berdin naiz. Translation: Yes. I am also fine. Alternative translations: - Yes. I am also OK. - Phrase: Hura al Mikel da? + Alternative versions: + - Al Mikel da? Translation: Is he Mikel? - Phrase: Bai. Hura Mikel da. + Alternative versions: + - Bai. Mikel da. Translation: Yes. He is Mikel. - Phrase: Kaixo Mikel. Zer moduz? diff --git a/courses/basque-from-english/02-QuestionsGreetings/skills/02-greetings-2.yaml b/courses/basque-from-english/02-QuestionsGreetings/skills/02-greetings-2.yaml index a5a03603deec..a1a1b5c86e50 100644 --- a/courses/basque-from-english/02-QuestionsGreetings/skills/02-greetings-2.yaml +++ b/courses/basque-from-english/02-QuestionsGreetings/skills/02-greetings-2.yaml @@ -86,12 +86,16 @@ Phrases: Translation: It is nothing. - Phrase: Barkatu. Berandu naiz. + Alternative versions: + - Barkatu. Ni berandu naiz. Translation: Sorry. I am late. - Phrase: Berandu da. Agur. Translation: It is late. Goodbye. - Phrase: Epa. Berandu naiz? + Alternative versions: + - Epa. Ni berandu naiz? Translation: Hi. Am I late? - Phrase: Barkatu. Autobusa berandu da. diff --git a/courses/basque-from-english/02-QuestionsGreetings/skills/02-questions-1.yaml b/courses/basque-from-english/02-QuestionsGreetings/skills/02-questions-1.yaml index 4934f43eb206..1dfce328606c 100644 --- a/courses/basque-from-english/02-QuestionsGreetings/skills/02-questions-1.yaml +++ b/courses/basque-from-english/02-QuestionsGreetings/skills/02-questions-1.yaml @@ -86,11 +86,15 @@ Phrases: Translation: What are you? - Phrase: Zu al zara irakaslea? + Alternative versions: + - Al zara irakaslea? Translation: Are you a teacher? Alternative translations: - Are you the teacher? - Phrase: Zu irakaslea edo ikaslea zara? + Alternative versions: + - Irakaslea edo ikaslea zara? Translation: Are you a teacher or a student? Alternative translations: - Are you the teacher or the student? @@ -107,16 +111,22 @@ Phrases: - What is it? - Phrase: Hura neska da? + Alternative versions: + - Neska da? Translation: Is she a girl? Alternative translations: - Is she the girl? - Phrase: Hura mutila da? + Alternative versions: + - Mutila da? Translation: Is he a boy? Alternative translations: - Is he the boy? - Phrase: Hura al autobusa da? + Alternative versions: + - Al autobusa da? Translation: Is it the bus? Alternative translations: - Is it a bus? @@ -125,17 +135,25 @@ Phrases: Translation: Is it also a car? - Phrase: Hura autobusa edo kotxea da? + Alternative versions: + - Autobusa edo kotxea da? Translation: Is it a bus or a car? Alternative translations: - Is it the bus or the car? - Phrase: Nortzuk gara gu? + Alternative versions: + - Nortzuk gara? Translation: Who are we? - Phrase: Zer gara gu? + Alternative versions: + - Zer gara? Translation: What are we? - Phrase: Nortzuk zarete zuek? + Alternative versions: + - Nortzuk zarete? Translation: Who are you(plural)? Alternative translations: - Who are you? @@ -145,23 +163,33 @@ Phrases: Translation: Who are they? - Phrase: Zer dira haiek? + Alternative versions: + - Zer dira? Translation: What are they? - Phrase: Haiek al autobusak dira? + Alternative versions: + - Al autobusak dira? Translation: Are they buses? - Phrase: Haiek autobusak edo kotxeak dira? + Alternative versions: + - Autobusak edo kotxeak dira? Translation: Are they buses or cars? Alternative translations: - Are they the buses or the cars? - Phrase: Zer zarete zuek? + Alternative versions: + - Zer zarete? Translation: What are you(plural)? Alternative translations: - What are you? - What are you'll? - Phrase: Zuek al zarete irakasleak? + Alternative versions: + - Al zarete irakasleak? Translation: Are you(plural) teachers? Alternative translations: - Are you teachers? @@ -177,9 +205,13 @@ Phrases: Translation: Who are the men? - Phrase: Nortzuk dira haiek? + Alternative versions: + - Nortzuk dira? Translation: Who are they? - Phrase: Haiek emakumeak edo gizonak dira? + Alternative versions: + - Emakumeak edo gizonak dira? Translation: Are they women or men? Mini-dictionary: diff --git a/courses/basque-from-english/03-PeoplePast/skills/03-PeopleAndPast-1.yaml b/courses/basque-from-english/03-PeoplePast/skills/03-PeopleAndPast-1.yaml index 9e781e87cbaa..93bdafb99bd0 100644 --- a/courses/basque-from-english/03-PeoplePast/skills/03-PeopleAndPast-1.yaml +++ b/courses/basque-from-english/03-PeoplePast/skills/03-PeopleAndPast-1.yaml @@ -54,6 +54,8 @@ Phrases: - Excuse me. Who is a driver? - Phrase: Hura autobus gidaria da. + Alternative versions: + - Autobus gidaria da. Translation: He is the bus driver. Alternative translations: - She is the bus driver. @@ -66,24 +68,34 @@ Phrases: - Excuse me. Who is a tour guide? - Phrase: Arratsalde on. Ni tour gida naiz. + Alternative versions: + - Arratsalde on. Tour gida naiz. Translation: Good Afternoon. I am the tour guide. Alternative translations: - Good Afternoon. I am a tour guide. - Phrase: Haiek turistak dira. + Alternative versions: + - Turistak dira. Translation: They are tourists. Alternative translations: - They are the tourists. - Phrase: Kaixo. Ni ere erizaina naiz. + Alternative versions: + - Kaixo. Ere erizaina naiz. Translation: Hello. I am also a nurse. - Phrase: Egun on. Zu al medikua zara? + Alternative versions: + - Egun on. Al medikua zara? Translation: Good Morning. Are you a doctor? Alternative translations: - Good Morning. Are you the doctor? - Phrase: Epa. Gu ikasleak gara. + Alternative versions: + - Epa. Ikasleak gara. Translation: Hi. We are students. Alternative translations: - Hi. We're students. @@ -91,6 +103,8 @@ Phrases: - Hi. We're the students. - Phrase: Bai. Gu gidariak gara. + Alternative versions: + - Bai. Gidariak gara. Translation: Yes. We are drivers. Alternative translations: - Yes. We are the drivers. @@ -98,6 +112,8 @@ Phrases: - Yes. We're the drivers. - Phrase: Bai. Gu medikuak gara. + Alternative versions: + - Bai. Medikuak gara. Translation: Yes. We are doctors. Alternative translations: - Yes. We are the doctors. @@ -105,12 +121,16 @@ Phrases: - Yes. We're the doctors. - Phrase: Zuek turistak zarete. + Alternative versions: + - Turistak zarete. Translation: You are tourists. Alternative translations: - You(plural) are tourists. - You'll are tourists. - Phrase: Zuek al poliziak zarete? + Alternative versions: + - Al poliziak zarete? Translation: Are you(plural) police officers? Alternative translations: - Are you'll police officers? @@ -119,14 +139,22 @@ Phrases: - Are you'll the police officers? - Are you the police officers? - - Phrase: Hura al polizia bat da. + - Phrase: Hura al polizia bat da? + Alternative versions: + - Al polizia bat da? + - Hura al polizia da? + - Al polizia da? Translation: Is he a police officer? Alternative translations: - Is she a police officer? - Is he the police officer? - Is she the police officer? + - Is he one police officer? + - Is she one police officer? - Phrase: Haiek erizainak edo medikuak dira? + Alternative versions: + - Erizainak edo medikuak dira? Translation: Are they nurses or doctors? Alternative translations: - Are they the nurses or the doctors? diff --git a/courses/basque-from-english/03-PeoplePast/skills/03-PeopleAndPast-2.yaml b/courses/basque-from-english/03-PeoplePast/skills/03-PeopleAndPast-2.yaml index 59473d7fc4a2..5aa48846e827 100644 --- a/courses/basque-from-english/03-PeoplePast/skills/03-PeopleAndPast-2.yaml +++ b/courses/basque-from-english/03-PeoplePast/skills/03-PeopleAndPast-2.yaml @@ -73,51 +73,99 @@ New words: Phrases: - Phrase: Ni ikaslea nintzen, baina orain irakaslea naiz. + Alternative versions: + - Ni ikaslea nintzen, baina orain ni irakaslea naiz. + - Ikaslea nintzen, baina orain ni irakaslea naiz. + - Ikaslea nintzen, baina orain irakaslea naiz. Translation: I was a student, but now I am a teacher. - Phrase: Ni turista nintzen, baina orain tour gida naiz. + Alternative versions: + - Ni turista nintzen, baina orain ni tour gida naiz. + - Turista nintzen, baina orain ni tour gida naiz. + - Turista nintzen, baina orain tour gida naiz. Translation: I was a tourist, but now I am a tour guide. - Phrase: Zu gidaria zinen, baina orain irakaslea zara. + Alternative versions: + - Zu gidaria zinen, baina orain zu irakaslea zara. + - Gidaria zinen, baina orain zu irakaslea zara. + - Gidaria zinen, baina orain irakaslea zara. Translation: You were a driver, but now you are a teacher. - Phrase: Zu neska zinen, baina orain emakume zara. + Alternative versions: + - Zu neska zinen, baina orain zu emakume zara. + - Neska zinen, baina orain zu emakume zara. + - Neska zinen, baina orain emakume zara. Translation: You were a girl, but now you are a woman. - Phrase: Hura irakaslea zen, baina orain erizaina da. + Alternative versions: + - Hura irakaslea zen, baina orain hura erizaina da. + - Irakaslea zen, baina orain hura erizaina da. + - Irakaslea zen, baina orain erizaina da. Translation: He was a teacher, but now he is a nurse. Alternative translations: - She was a teacher, but now she is a nurse. - Phrase: Hura polizia zen, baina orain tour gida da. + Alternative versions: + - Hura polizia zen, baina orain hura tour gida da. + - Polizia zen, baina orain hura tour gida da. + - Polizia zen, baina orain tour gida da. Translation: He was a police officer, but now he is a tour guide. Alternative translations: - She was a police officer, but now she is a tour guide. - Phrase: Gu mutilak ginen, baina gizonak gara. + Alternative versions: + - Gu mutilak ginen, baina gu gizonak gara. + - Mutilak ginen, baina gu gizonak gara. + - Mutilak ginen, baina gizonak gara. Translation: We were boys, but now we are men. - Phrase: Gu turistak ginen, baina orain ikasleak gara. + Alternative versions: + - Gu turistak ginen, baina orain gu ikasleak gara. + - Turistak ginen, baina orain gu ikasleak gara. + - Turistak ginen, baina orain ikasleak gara. Translation: We were tourists, but now we are teachers. - Phrase: Zuek medikuak zineten, baina orain turistak dira. + Alternative versions: + - Zuek medikuak zineten, baina orain zuek turistak dira. + - Medikuak zineten, baina orain zuek turistak dira. + - Medikuak zineten, baina orain turistak dira. Translation: You(plural) were doctors, but now you(plural) are tourists. Alternative translations: - You'll were doctors, but now you are tourists. - You were doctors, but now you are tourists. - Phrase: Zuek ikasleak zineten, baina orain medikuak zarete. + Alternative versions: + - Zuek ikasleak zineten, baina orain zuek medikuak zarete. + - Ikasleak zineten, baina orain zuek medikuak zarete. + - Ikasleak zineten, baina orain medikuak zarete. Translation: You(plural) were students, but now you are doctors. Alternative translations: - You'll were students, but now you'll are doctors. - You were students, but now you'll are doctors. - Phrase: Haiek ikasleak ziren, baina orain erizainak dira. + Alternative versions: + - Haiek ikasleak ziren, baina orain haiek erizainak dira. + - Ikasleak ziren, baina orain haiek erizainak dira. + - Ikasleak ziren, baina orain erizainak dira. Translation: They were students, but now they are nurses. Alternative translations: - They were students, but now they're nurses. - Phrase: Haiek gidariak ziren, baina orain ikasleak dira. + Alternative versions: + - Haiek gidariak ziren, baina orain haiek ikasleak dira. + - Gidariak ziren, baina orain haiek ikasleak dira. + - Gidariak ziren, baina orain ikasleak dira. Translation: They were drivers, but now they are students. Alternative translations: - They were drivers, but now they're students. diff --git a/courses/basque-from-english/03-PeoplePast/skills/03-PeopleAndPast-3.yaml b/courses/basque-from-english/03-PeoplePast/skills/03-PeopleAndPast-3.yaml index 0f1356bb1aec..aa9ee9ba0614 100644 --- a/courses/basque-from-english/03-PeoplePast/skills/03-PeopleAndPast-3.yaml +++ b/courses/basque-from-english/03-PeoplePast/skills/03-PeopleAndPast-3.yaml @@ -55,18 +55,38 @@ New words: Phrases: - Phrase: Ni neska nintzen, baina orain etxekoandrea naiz. + Alternative versions: + - Ni neska nintzen, baina orain ni etxekoandrea naiz. + - Neska nintzen, baina orain ni etxekoandrea naiz. + - Neska nintzen, baina orain etxekoandrea naiz. Translation: I was a girl, but now I am a housewife. - Phrase: Ni ikaslea nintzen, baina orain apaiza naiz. + Alternative versions: + - Ni ikaslea nintzen, baina orain ni apaiza naiz. + - Ikaslea nintzen, baina orain ni apaiza naiz. + - Ikaslea nintzen, baina orain apaiza naiz. Translation: I was a student, but now I am a priest. - - Phrase: Camareroa zinen, baina orain irakaslea zara. + - Phrase: Zu camareroa zinen, baina orain irakaslea zara. + Alternative versions: + - Zu camareroa zinen, baina orain zu irakaslea zara. + - Camareroa zinen, baina orain zu irakaslea zara. + - Camareroa zinen, baina orain irakaslea zara. Translation: You were a waiter, but now you are a teacher. - Phrase: Zu arrotza zinen, baina orain laguna zara. + Alternative versions: + - Zu arrotza zinen, baina orain zu laguna zara. + - Arrotza zinen, baina orain zu laguna zara. + - Arrotza zinen, baina orain laguna zara. Translation: You were a stranger, but now you are a friend. - Phrase: Hura gidaria zen, baina orain sukaldaria da. + Alternative versions: + - Hura gidaria zen, baina orain hura sukaldaria da. + - Gidaria zen, baina orain hura sukaldaria da. + - Gidaria zen, baina orain sukaldaria da. Translation: He was a driver, but now he is a chef. Alternative translations: - She was a driver, but now she is a chef. @@ -74,6 +94,10 @@ Phrases: - She was a driver, but now she is a cook. - Phrase: Hura sukaldaria zen, baina orain medikua da. + Alternative versions: + - Hura sukaldaria zen, baina orain hura medikua da. + - Sukaldaria zen, baina orain hura medikua da. + - Sukaldaria zen, baina orain medikua da. Translation: She was a cook, but now she is a doctor. Alternative translations: - He was a cook, but now he is a doctor. @@ -81,16 +105,28 @@ Phrases: - He was a chef, but now hee is a doctor. - Phrase: Gu lagunak ginen, baina orain arrotzak gara. + Alternative versions: + - Gu lagunak ginen, baina orain gu arrotzak gara. + - Lagunak ginen, baina orain gu arrotzak gara. + - Lagunak ginen, baina orain arrotzak gara. Translation: We were friends, but now we are strangers. Alternative translations: - We were friends, but now we're strangers. - Phrase: Gu camareroak ginen, baina orain poliziak gara. + Alternative versions: + - Gu camareroak ginen, baina orain gu poliziak gara. + - Camareroak ginen, baina orain gu poliziak gara. + - Camareroak ginen, baina orain poliziak gara. Translation: We were waiters, but now we are police officers. Alternative translations: - We were waiters, but now we're police officers. - Phrase: Zuek turistak zineten, baina orain apaizak zara. + Alternative versions: + - Zuek turistak zineten, baina orain zuek apaizak zara. + - Turistak zineten, baina orain zuek apaizak zara. + - Turistak zineten, baina orain apaizak zara. Translation: You(plural) were tourists, but now you(plural) are priests. Alternative translations: - You'll were tourists, but now you'll are priests. @@ -98,6 +134,10 @@ Phrases: - You were tourists, but now you're priests. - Phrase: Zuek arrotzak zineten, baina orain lagunak zara. + Alternative versions: + - Zuek arrotzak zineten, baina orain zuek lagunak zara. + - Arrotzak zineten, baina orain zuek lagunak zara. + - Arrotzak zineten, baina orain lagunak zara. Translation: You(plural) were strangers, but now you(plural) are friends. Alternative translations: - You'll were strangers, but now you'll are friends. @@ -105,11 +145,19 @@ Phrases: - You were strangers, but now you're friends. - Phrase: Haiek erizainak ziren, baina orain etxekoandreak dira. + Alternative versions: + - Haiek erizainak ziren, baina orain haiek etxekoandreak dira. + - Erizainak ziren, baina orain haiek etxekoandreak dira. + - Erizainak ziren, baina orain etxekoandreak dira. Translation: They were nurses, but now they are housewives. Alternative translations: - They were nurses, but now they're housewives. - Phrase: Haiek mutilak ziren, baina orain apaizak dira. + Alternative versions: + - Haiek mutilak ziren, baina orain haiek apaizak dira. + - Mutilak ziren, baina orain haiek apaizak dira. + - Mutilak ziren, baina orain apaizak dira. Translation: They were boys, but now they are priests. Alternative translations: - They were boys, but now they're priests. diff --git a/courses/basque-from-english/04-AdjNo/skills/04-AdjNo-2.yaml b/courses/basque-from-english/04-AdjNo/skills/04-AdjNo-2.yaml index a88fe5f249c6..c0d04170b93b 100644 --- a/courses/basque-from-english/04-AdjNo/skills/04-AdjNo-2.yaml +++ b/courses/basque-from-english/04-AdjNo/skills/04-AdjNo-2.yaml @@ -115,31 +115,44 @@ Phrases: - Phrase: Dendak ez ziren zuriak, baina berdeak. Translation: The stores were not not white, but green. - - Phrase: Hura ez da medikua, baina medikua zen. + - Phrase: Hura ez da medikua, baina ni medikua zen. + Alternative versions: + - Hura ez da medikua, baina medikua zen. + - Ez da medikua, ni baina medikua zen. + - Ez da medikua, baina medikua zen. Translation: She is not a doctor, but I was a doctor. Alternative translations: - He is not a doctor, but I was a doctor. - - Phrase: Hura ez zen ikaslea, baina irakaslea nintzen. + - Phrase: Hura ez zen ikaslea, baina ni irakaslea nintzen. + Alternative versions: + - Hura ez zen ikaslea, baina irakaslea nintzen. + - Ez zen ikaslea, baina ni irakaslea nintzen. + - Ez zen ikaslea, baina irakaslea nintzen. Translation: He was not a student, but I was a teacher. Alternative translations: - She was not a student, but I was a teacher. - Phrase: Zu ez zara polizia. + Alternative versions: + - Ez zara polizia. Translation: You are not a police officer. Alternative translations: - You are not the police officer. - Phrase: Gu ez ginen medikuak, baizik erizainak. + Alternative versions: + - Ez ginen medikuak, baizik erizainak. Translation: We were not doctors, but nurses. - Phrase: Zuek ez zineten turistak. + Alternative versions: + - Ez zineten turistak. Translation: You(plural) were not tourists. Alternative translations: - You'll were not tourists. - You were not tourists. - Mini-dictionary: Basque: - bai: yes diff --git a/courses/basque-from-english/04-AdjNo/skills/04-AdjNo-4.yaml b/courses/basque-from-english/04-AdjNo/skills/04-AdjNo-4.yaml index 95ebf4e5e1dc..f6b7576e8830 100644 --- a/courses/basque-from-english/04-AdjNo/skills/04-AdjNo-4.yaml +++ b/courses/basque-from-english/04-AdjNo/skills/04-AdjNo-4.yaml @@ -68,7 +68,9 @@ Phrases: - A tour guide is pretty, but a tourist is beautiful. - A tour guide is pretty, but a tourist is handsome. - - Phrase: Medikua ez da itsusia, baizik ederra da + - Phrase: Medikua ez da itsusia, baizik ederra da. + Alternative versions: + - Medikua ez da itsusia, baizik hura ederra da. Translation: The doctor is not ugly, but rather he is handsome. Alternative translations: - The doctor is not ugly, but rather she is beautiful. diff --git a/courses/basque-from-english/05-Animaliak/skills/05-Animaliak-1.yaml b/courses/basque-from-english/05-Animaliak/skills/05-Animaliak-1.yaml index f6a699a510c4..3ee075a4364a 100644 --- a/courses/basque-from-english/05-Animaliak/skills/05-Animaliak-1.yaml +++ b/courses/basque-from-english/05-Animaliak/skills/05-Animaliak-1.yaml @@ -121,11 +121,15 @@ Phrases: Translation: Boys and girls are also animals. - Phrase: Ni katu gizen bat nintzen. + Alternative versions: + - Katu gizen bat nintzen. Translation: I was one fat cat. Alternative translations: - I was a fat cat. - Phrase: Zu txakur argal bat zinen. + Alternative versions: + - Txakur argal bat zinen. Translation: You were one thin dog. Alternative translations: - You were a thin dog. diff --git a/courses/basque-from-english/05-Animaliak/skills/05-Animaliak-2.yaml b/courses/basque-from-english/05-Animaliak/skills/05-Animaliak-2.yaml index 2ffbc2a5848a..7ca3e255a9b3 100644 --- a/courses/basque-from-english/05-Animaliak/skills/05-Animaliak-2.yaml +++ b/courses/basque-from-english/05-Animaliak/skills/05-Animaliak-2.yaml @@ -62,6 +62,8 @@ New words: Phrases: - Phrase: Zu sagua zara. + Alternative versions: + - Sagua zara. Translation: You are a mouse. Alternative translations: - You are the mouse. @@ -93,6 +95,8 @@ Phrases: Translation: They are cows. They are not goats. - Phrase: Zuek txerri altuak eta ardi laburak zarete. + Alternative versions: + - Txerri altuak eta ardi laburak zarete. Translation: You(plural) are tall pigs and short sheep. Alternative translations: - You'll are tall pigs and short sheep. diff --git a/courses/basque-from-english/06-ThisThatMy/skills/06-ThisThatMy-2.yaml b/courses/basque-from-english/06-ThisThatMy/skills/06-ThisThatMy-2.yaml index 17568664ca8c..6bb2ea9fad5c 100644 --- a/courses/basque-from-english/06-ThisThatMy/skills/06-ThisThatMy-2.yaml +++ b/courses/basque-from-english/06-ThisThatMy/skills/06-ThisThatMy-2.yaml @@ -52,14 +52,20 @@ New words: Phrases: - Phrase: Hura nire irakaslea da. + Alternative versions: + - Nire irakaslea da. Translation: He is my teacher. Alternative translations: - She is my teacher. - Phrase: Haiek nire zaldiak dira. + Alternative versions: + - Nire zaldiak dira. Translation: They are my horses. - Phrase: Hura ere nire irakaslea da. + Alternative versions: + - Ere nire irakaslea da. Translation: He is also my teacher. Alternative translations: - She is also my teacher. @@ -68,36 +74,50 @@ Phrases: Translation: You are my friends. - Phrase: Gu zuen ikasleak gara. + Alternative versions: + - Zuen ikasleak gara. Translation: We are your students. - Phrase: Zure medikua irakaslea zen. Translation: Your doctor was a teacher. - Phrase: Ni zure irakaslea naiz. + Alternative versions: + - Zure irakaslea naiz. Translation: I am your teacher. - Phrase: Bai. Ni bere erizaina naiz + Alternative versions: + - Bai. Bere erizaina naiz. Translation: Yes. I am his nurse. Alternative translations: - Yes. I am her nurse. - Phrase: Gu bere ikasleak gara? + Alternative versions: + - Bere ikasleak gara? Translation: Are we his students? Alternative translations: - Are we her students? - Phrase: Hura gure autobus gidaria da. + Alternative versions: + - Gure autobus gidaria da. Translation: He is our bus driver. Alternative translations: - She is our bus driver - Phrase: Zuek gure gidariak zarete? + Alternative versions: + - Gure gidariak zarete? Translation: Are you(plural) our drivers? Alternative translations: - Are you'll our drivers? - Are you our drivers? - Phrase: Haiek zuen irakasleak dira. + Alternative versions: + - Zuen irakasleak dira. Translation: They are your teachers. - Phrase: Hori da zuen eskola. @@ -107,6 +127,8 @@ Phrases: - That is your school. - Phrase: Hura zuen laguna dira. + Alternative versions: + - Zuen laguna dira. Translation: She is your(plural) friend. Alternative translations: - He is your(plural) friend. @@ -116,9 +138,13 @@ Phrases: - He is your friend. - Phrase: Zu haien gidaria zara? + Alternative versions: + - Haien gidaria zara? Translation: Are you their driver? - Phrase: Bai. Ni haien medikua naiz. + Alternative versions: + - Bai. Haien medikua naiz. Translation: Yes. I am their doctor. - Phrase: Haien irakaslea medikua zen. diff --git a/courses/basque-from-english/07-Noren/skills/07-Noren-3.yaml b/courses/basque-from-english/07-Noren/skills/07-Noren-3.yaml index 82db0f2ac323..2412d694b951 100644 --- a/courses/basque-from-english/07-Noren/skills/07-Noren-3.yaml +++ b/courses/basque-from-english/07-Noren/skills/07-Noren-3.yaml @@ -98,11 +98,15 @@ Phrases: - It is the pen of my friend. - Phrase: Zu Mirenen laguna zara? + Alternative versions: + - Mirenen laguna zara? Translation: Are you Miren’s friend? Alternative translations: - Are you a friend of Miren? - Phrase: Bai, ni Mirenen lagun naiz. + Alternative versions: + - Bai, Mirenen lagun naiz. Translation: Yes, I am Miren’s friend. Alternative translations: - Yes I am a friend of Miren. diff --git a/courses/basque-from-english/09-Egon/skills/09-Egon-1.yaml b/courses/basque-from-english/09-Egon/skills/09-Egon-1.yaml index 8bc046979656..070db603cb22 100644 --- a/courses/basque-from-english/09-Egon/skills/09-Egon-1.yaml +++ b/courses/basque-from-english/09-Egon/skills/09-Egon-1.yaml @@ -82,17 +82,25 @@ New words: Phrases: - Phrase: Arratsalde on. Non zaude zu? + Alternative versions: + - Arratsalde on. Non zaude? Translation: Good Afternoon. Where are you? - - Phrase: Ni etxean nago + - Phrase: Ni etxean nago. + Alternative versions: + - Etxean nago. Translation: I am in the house. Alternative translations: - I am in a house. - Phrase: Barkatu. Non nago? + Alternative versions: + - Barkatu. Ni non nago? Translation: Excuse me. Where am I? - Phrase: Egun on. Gure ostatuan zaude. + Alternative versions: + - Egun on. Zu gure ostatuan zaude. Translation: Good morning. You are in our mini-hotel. - Phrase: Non dago etxekoandrea? @@ -116,20 +124,30 @@ Phrases: - A stranger is in a hotel. - Phrase: Barkatu. Non gaude? + Alternative versions: + - Barkatu. Gu non gaude? Translation: Excuse me. Where are we? - Phrase: Egun on. Elizan gaude. + Alternative versions: + - Egun on. Gu elizan gaude. Translation: Good Morning. We are in the church. Alternative translations: - Good Morning. We are in a church. - Phrase: Zuek kanpoan zaudete. Gu barruan gaude. + Alternative versions: + - Zuek kanpoan zaudete. Barruan gaude. + - Kanpoan zaudete. Gu barruan gaude. + - Kanpoan zaudete. Barruan gaude. Translation: You(plural) are outside. We are inside. Alternative translations: - You'll are outside. We are inside. - You are outside. We are inside. - Phrase: Zuek elizan ere zaudete. + Alternative versions: + - Elizan ere zaudete. Translation: You(plural) are also in the church. Alternative translations: - You(plural) are also in a church. diff --git a/courses/basque-from-english/09-Egon/skills/09-Egon-2.md b/courses/basque-from-english/09-Egon/skills/09-Egon-2.md index 1c0130d2beb0..4507d1383b86 100644 --- a/courses/basque-from-english/09-Egon/skills/09-Egon-2.md +++ b/courses/basque-from-english/09-Egon/skills/09-Egon-2.md @@ -9,19 +9,6 @@ * Note that the word Herri can mean different things (town, village, region) depending on context. * In this lesson you will see the term Euskal Herrian: Basque Country, a name you should learn. - -### Vocabulary Egon 1 -* Ni nago: I am -* Zu zaude: You are -* Hura dago: He/she/it is -* Gu gaude: We are -* Zuek zaudete: You (plural) are -* Haiek daude: They are -* zuhaitz: tree -* non: where -* kanpo: outside -* barruan: inside - ### Vocabulary Egon 2 * Madril: Madrid * Espainia: Spain diff --git a/courses/basque-from-english/09-Egon/skills/09-Egon-2.yaml b/courses/basque-from-english/09-Egon/skills/09-Egon-2.yaml index 3ed41020f5e0..71d4f9ff7b13 100644 --- a/courses/basque-from-english/09-Egon/skills/09-Egon-2.yaml +++ b/courses/basque-from-english/09-Egon/skills/09-Egon-2.yaml @@ -91,6 +91,8 @@ Phrases: - A shirt is there. - Phrase: Gu Madrilen gaude. + Alternative versions: + - Madrilen gaude. Translation: We are in Madrid. - Phrase: Non dago Madril? @@ -106,18 +108,26 @@ Phrases: Translation: Spain is in Europe. - Phrase: Zuek basoan zaudete. + Alternative versions: + - Basoan zaudete. Translation: You (plural) are in the woods. Alternative translations: - You'll are in the woods. - You are in the woods. - Phrase: Non daude haiek? + Alternative versions: + - Non daude? Translation: Where are they? - Phrase: Haiek han daude. + Alternative versions: + - Han daude. Translation: They are over there. - Phrase: Zuek Euskal Herrian zaudete. + Alternative versions: + - Euskal Herrian zaudete. Translation: You(plural) are in Basque country. Alternative translations: - You'll are in Basque country. @@ -139,11 +149,12 @@ Phrases: - Phrase: Non daude zure aterkiak? Translation: Where are your umbrellas? - - Phrase: Nire lagunak Euskal Herrian daude. Translation: My friends are in Basque Country. - Phrase: Ni hemen nago. + Alternative versions: + - Hemen nago. Translation: I am here. - Phrase: Gerrikoa ez dago hemen.. diff --git a/courses/basque-from-english/09-Egon/skills/09-Egon-3.yaml b/courses/basque-from-english/09-Egon/skills/09-Egon-3.yaml index 9a6b10dcae3d..a3c79c578d51 100644 --- a/courses/basque-from-english/09-Egon/skills/09-Egon-3.yaml +++ b/courses/basque-from-english/09-Egon/skills/09-Egon-3.yaml @@ -71,6 +71,8 @@ New words: Phrases: - Phrase: Hura Frantzia dago. + Alternative versions: + - Frantzia dago. Translation: She is in France. Alternative translations: - He is in France. @@ -82,6 +84,8 @@ Phrases: Translation: Look! There is France. - Phrase: Gu Gasteizen gaude. + Alternative versions: + - Gasteizen gaude. Translation: We are in Victoria. - Phrase: Non dago Gasteiz? @@ -106,12 +110,18 @@ Phrases: Translation: The river is in San Sebastian. - Phrase: Haiek han daude. + Alternative versions: + - Han daude. Translation: They are over there. - Phrase: Irunan nago. + Alternative versions: + - Ni Irunan nago. Translation: I am in Irun. - Phrase: Zu Euskal Herrian zaude. + Alternative versions: + - Euskal Herrian zaude. Translation: You are in Basque country. - Phrase: Non dago eraztuna? diff --git a/courses/basque-from-english/09-Family/skills/09-Family-2.yaml b/courses/basque-from-english/09-Family/skills/09-Family-2.yaml new file mode 100644 index 000000000000..55e735f93ede --- /dev/null +++ b/courses/basque-from-english/09-Family/skills/09-Family-2.yaml @@ -0,0 +1,521 @@ +Skill: + Id: 92 + Name: Family 2 + Thumbnails: + +New words: + - Word: biloba + Translation: grandson + Also accepted: + - granddaughter + Images: + - grandson1 + - granddaughter1 + - grandson2 + + - Word: emaztea + Translation: wife + Images: + - wife1 + - wife2 + - wife3 + + - Word: izeba + Translation: aunt + Images: + - aunt1 + - aunt2 + - aunt3 + + - Word: lehengusu + Translation: cousin (male) + Images: + - cousinmale1 + - cousinmale2 + - cousinmale3 + + - Word: lehengusina + Translation: cousin (female) + Images: + - cousinfemale1 + - cousinfemale2 + - cousinfemale3 + + - Word: osaba + Translation: uncle + Images: + - uncle1 + - uncle2 + - uncle3 + + - Word: seme-alba + Translation: children + Also accepted: + - sons and daughters + Images: + - children1 + - children2 + - children3 + + - Word: senarra + Translation: husband + Images: + - husband1 + - husband2 + - husband3 + + - Word: ume + Translation: child + Images: + - child1 + - child2 + - child3 + +Phrases: + - Phrase: Haiek nire seme-alba dira. + Translation: They are my children. + + - Phrase: Haiek gure bilobak dira. + Translation: They are our grandchildren. + + - Phrase: Zu nire umea zara. + Translation: You are my child. + + - Phrase: Umea nire semea da. + Translation: The child is my son. + + - Phrase: Ni zure osaba naiz. + Translation: I am your uncle. + + - Phrase: Hura gure izeba da. + Translation: She is our aunt. + + - Phrase: Gizon hau nire senarra da. + Translation: This man is my husband. + + - Phrase: Emakumea hau nire emaztea da. + Translation: This woman is my wife. + + - Phrase: Nire emaztea polizia da. + Translation: My wife is a police officer. + + - Phrase: Bere senarra gida tour gida da. + Translation: Her husband is a tour guide. + + - Phrase: Gure osaba erizaina bat da. + Translation: Our uncle is an nurse. + + - Phrase: Nire lehengusua da ere ingeniaria. + Translation: My cousin (male) is also an engineer. + + - Phrase: Haien izeba medikua da. + Translation: Their aunt is a doctor. + + - Phrase: Nire lehengusina ere medikua da. + Translation: My cousin (female) is also a doctor. + + - Phrase: Gure izeba irakaslea da. + Translation: Our aunt is a teacher. + + - Phrase: Nire osabaren semea lehengusua da. + Translation: My uncle's son is my cousin (male). + + - Phrase: Nire izebare alaba nire lehengusina da. + Translation: My aunt's daughter is my cousin (female). + +Mini-dictionary: + Basque: + - Anitzarenak: Anitza's (female name, plural object) + - Lili: Lili (LibreLingo Turtle) + - Mikelenak: Mikel's (male name) + - Mirenen: Miren's (female name) + - Xabieren: Xabier's (male name) + - aiton-amonak: grandparents + - aiton: grandfather + - aitona: grandfather + - aitonaren: grandfather's + - aita: father + - aitaren: father's + - alaba: daughter + - alabak: daughters + - alabaren: daughter's + - altua: tall + - ama: mother + - amaren: mother's + - amon: grandmother + - amona: grandmother + - amonaren: grandmother's + - animalia: animal + - animaliak: animals + - argala: thin + - arkatza: pencil + - arkatzak: pencils + - aterki: umbrella + - aterkia: umbrella + - aterkiak: umbrellas + - autobus: bus + - autobusa: bus + - azkarra: fast + - baina: but + - baloi: ball + - baloia: ball + - baloiak: balls + - bat: one + - begira!: look! + - beltz: black + - beltza: black + - berde: green + - berdea: green + - berdeak: green + - bere: + - his + - hers + - its + - berea: + - his + - hers + - its + - berria: new + - biloba: + - grandson + - granddaughter + - bilobak: grandchildren + - bizikleta: bicycle + - bizikletak: bicycles + - boligrafo: pen + - boligrafoa: pen + - boligrafoak: pens + - da: is + - dira: are + - dortoka: a turtle + - dortokak: turtles + - emakumea: woman + - emaztea: wife + - ere: also + - erloju: watch + - erlojua: watch + - erlojuak: watches + - eskola: school + - eta: and + - etxe: house + - etxea: house + - ez: not, no + - gaztea: young + - gizon: man + - gida: guide + - gizen: fat + - gizena: fat + - gorri: red + - gorria: red + - gris: gray + - grisa: gray + - grisak: gray + - gurasoak: parents + - gure: our + - gurea: ours + - gureak: ours + - haiek: + - those over there, plural of hura + - they + - handia: big + - handiak: big + - hau: this + - hauek: These, plural of hau + - haiena: theirs + - haien: their + - hontz: owl + - hontza: owl + - hontzak: owls + - hori: + - that + - yellow + - horia: yellow + - horiak: yellow + - horiek: Those, plural of hori + - hotel: hotel + - hotelak: hotels + - hura: + - that over there + - he + - she + - it + - ikasleak: students + - ikasleenak: students' + - ingeniari: engineer + - ingeniaria: engineer + - irakaslea: teacher + - itsusia: ugly + - izeba: aunt + - izebare: aunt's + - katu: cat + - katua: a cat + - katuak: cats + - kotxe: car + - kotxea: car + - kotxeak: cars + - labura: short + - lagun: friend + - laguna: friend + - lagunen: friend's + - lagunaren: friend's + - laranja: orange + - laranjak: orange + - lehengusu: cousin (male) + - lehengusua: cousin (male) + - lehengusina: cousin (female) + - liburu: book + - liburua: a book + - liburua: books + - liburuak: books + - medikua: doctor + - motxila: backpack + - motxilak: backpacks + - morea: purple + - motela: slow + - mutil: boy + - mutila: boy + - mutilak: boys + - naiz: am + - neska: girl + - neskak: girls + - ni: I + - nire: my + - nirea: mine + - nireak: mine + - nor: who + - noren: whose + - norena: whose + - norenak: whose (plural) + - oilasko: chicken + - oilaskoa: a chicken + - oilaskoak: chickens + - orain : now + - osaba: uncle + - osabaren: uncle's + - polita: pretty + - poltsa: purse + - poltsak: purses + - polizia: police officer + - seme: son + - semea: son + - semeak: sons + - semearen: son's + - seme-alba: children + - senarra: husband + - tour: tour + - turista: tourist + - txakur: dog + - txakura: a dog + - txakurrak: dogs + - txikia: small + - txoria: bird + - txoriak: birds + - ume: child + - umea: child + - urdin: blue + - urdina: blue + - urdinak: blue + - uso: pigeon + - usoa: a pigeon + - usoak: pigeons + - zahara: old + - zaharra: old + - zaharrak: old + - zara: are + - zarete: their + - zein: which + - zen: was + - zer: what + - zu: you + - zuek: your (plural) + - zuen: yours + - zuena: yours (plural) + - zuenak: yours (plural) + - zure: your + - zurea: yours + - zureak: yours + - zuri: white + - zuria: white + - zuriak: white + + English: + - Anitza's: Anitzarenak (female name, plural object) + - Lili: Lili (LibreLingo Turtle) + - Mikel's: Mikelenak (male name) + - Miren's: Mirenen(female name) + - Xabier's: Xabieren (male name) + - a: -a + - also: ere + - am: naiz + - an: -ak + - and: eta + - animal: animalia + - animals: animaliak + - are: + - dira + - zara + - aunt: izeba + - aunt's: izebare + - ball: baloi + - balls: baloiak + - backpack: motxila + - backpacks: motxilak + - bicycle: bizikleta + - bicycles: bizikletak + - big: handi + - bird: txoria + - birds: txoriak + - black: beltz + - blue: urdin + - book: liburu + - books: liburuak + - boy: mutil + - boys: mutilak + - bus: autobusa + - but: baina + - car: kotxea + - cars: kotxeak + - cat: katu + - cats: katuak + - chicken: oilasko + - chickens: oilaskoak + - child: ume + - children: + - umeak + - seme-alba + - cousin: + - lehengusu + - lehengusina + - daughter: alaba + - daughters: alabak + - daughter's: alabaren + - doctor: medikua + - dog: txakur + - dogs: txakurrak + - engineer: ingeniari + - fast: azkar + - fat: gizena + - father: aita + - fathers: aitak + - father's: aitaren + - female: emakumezkoa + - friend: laguna + - friend's: lagunen + - friends': lagunaren + - girl: neska + - girls: neskak + - gray: gris + - grandchildren: bilobak + - granddaughter: biloba + - grandparents: aiton-amonak + - grandfather: aiton + - grandfather: aitona + - grandfather's: aitonaren + - grandmother: amon + - grandmother: amona + - grandmother's: amonaren + - grandson: biloba + - green: berde + - guide: gida + - hau: hau + - he: hura + - his: + - bere + - berea + - her: bere + - hers: berea + - hotel: hotel + - hotels: hotelak + - house: etxea + - hura: hura + - husband: senarra + - I: ni + - is: da + - it: hura + - its: berea + - look!: begira! + - male: gizonezkoa + - man: gizon + - mine: nirea + - owls: hontzak + - mother: ama + - mother's: amaren + - mothers: amak + - my: nire + - new: berri + - no: ez + - not: ez + - now: orain + - of: de + - officer: ofiziala + - old: zahar + - one: bat + - orange: laranja + - our: gure + - ours: gurea + - over: amaitu + - owl: hontza + - parents: gurasoak + - pen: boligrafo + - pencil: arkatza + - pencils: arkatzak + - pens: boligrafoak + - police: polizia + - plural: plurala + - pretty: polit + - purple: morea + - purse: poltsa + - purses: poltsak + - red: gorri + - school: eskola + - she: hura + - short: labur + - slow: motel + - son: seme + - sons: semeak + - son's: semearen + - small: txiki + - students: ikasleak + - students': ikasleenak + - tall: altu + - teacher: irakaslea + - that: + - hori + - hura + - the: -a + - there: hor + - these: hauek + - their: haien + - theirs: haiena + - they: haiek + - thin: argal + - this: hau + - those: + - haiek + - horiek + - tour: tour + - tourist: turista + - turtle: dortoka + - turtles: dortokak + - ugly: itsusi + - umbrella: aterki + - umbrellas: aterkiak + - uncle: osaba + - uncle's: osabaren + - was: zen + - watch: erloju + - watches: erlojuak + - what: zer + - which: zein + - white: zuri + - who: nor + - whose: noren + - wife: emaztea + - woman: emakumea + - yellow: hori + - you: zu + - young: gazte + - your: zure + - yours: + - zurea + - zuena diff --git a/courses/basque-from-english/10-Numbers/skills/10-Numbers-1.yaml b/courses/basque-from-english/10-Numbers/skills/10-Numbers-1.yaml index c2f45e62176c..a774e7f7d2e1 100644 --- a/courses/basque-from-english/10-Numbers/skills/10-Numbers-1.yaml +++ b/courses/basque-from-english/10-Numbers/skills/10-Numbers-1.yaml @@ -42,9 +42,9 @@ New words: - Word: euro Translation: euro Images: - - one1 - - one2 - - one3 + - euro1 + - euro2 + - euro3 - Word: zenbat Translation: How much @@ -71,6 +71,10 @@ Phrases: Translation: There are two women. - Phrase: Arratsalde on. Aitor naiz. Mutil bat naiz. + Alternative versions: + - Arratsalde on. Ni Aitor naiz. Ni mutil bat naiz. + - Arratsalde on. Aitor naiz. Ni mutil bat naiz. + - Arratsalde on. Ni Aitor naiz. Mutil bat naiz. Translation: Good afternoon. I am Aitor. I am one boy. Alternative translations: - Good afternoon. I am Aitor. I am a boy. diff --git a/courses/basque-from-english/10-Numbers/skills/10-Numbers-2.yaml b/courses/basque-from-english/10-Numbers/skills/10-Numbers-2.yaml index 0f36ea4c280b..2bc6811aa2ff 100644 --- a/courses/basque-from-english/10-Numbers/skills/10-Numbers-2.yaml +++ b/courses/basque-from-english/10-Numbers/skills/10-Numbers-2.yaml @@ -61,6 +61,8 @@ Phrases: Translation: There are seven turtles. Lili and six friends. - Phrase: Gu hamar etxekoandre gara. + Alternative versions: + - Hamar etxekoandre gara. Translation: We are ten housewives. - Phrase: Zenbat ardi daude? diff --git a/courses/basque-from-english/10-Numbers/skills/10-Numbers-3.yaml b/courses/basque-from-english/10-Numbers/skills/10-Numbers-3.yaml index ac3ce328e1d7..3f7f36637005 100644 --- a/courses/basque-from-english/10-Numbers/skills/10-Numbers-3.yaml +++ b/courses/basque-from-english/10-Numbers/skills/10-Numbers-3.yaml @@ -78,6 +78,8 @@ Phrases: Translation: How many are you? - Phrase: Hamabi gara. + Alternative versions: + - Gu hamabi gara Translation: We are twelve. - Phrase: Zenbat arrotz daude?