merge

.obsidian/workspace.json

@@ -1,232 +1,232 @@
-{
-  "main": {
-    "id": "702c86104f0a0629",
-    "type": "split",
-    "children": [
-      {
-        "id": "d32e90214846329f",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "9fcc05866a0efe94",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "ROTEK/allwinner 069 070.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "allwinner 069 070"
-            }
-          },
-          {
-            "id": "aac30ac1aa814964",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "English/Homework/Homework 7.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "Homework 7"
-            }
-          },
-          {
-            "id": "f2567d12b68b0d39",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "English/words.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "words"
-            }
-          }
-        ],
-        "currentTab": 1
-      }
-    ],
-    "direction": "vertical"
-  },
-  "left": {
-    "id": "6664e9908eeea5a2",
-    "type": "split",
-    "children": [
-      {
-        "id": "97095e32830cbc6f",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "c7584343712d3d31",
-            "type": "leaf",
-            "state": {
-              "type": "file-explorer",
-              "state": {
-                "sortOrder": "alphabetical",
-                "autoReveal": false
-              },
-              "icon": "lucide-folder-closed",
-              "title": "Файловый менеджер"
-            }
-          },
-          {
-            "id": "e389aabe146b0498",
-            "type": "leaf",
-            "state": {
-              "type": "search",
-              "state": {
-                "query": "",
-                "matchingCase": false,
-                "explainSearch": false,
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical"
-              },
-              "icon": "lucide-search",
-              "title": "Search"
-            }
-          },
-          {
-            "id": "5f649a68cfee8d78",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Python/SQLite.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "SQLite"
-            }
-          },
-          {
-            "id": "9cc940b45c7a4595",
-            "type": "leaf",
-            "state": {
-              "type": "bookmarks",
-              "state": {},
-              "icon": "lucide-bookmark",
-              "title": "Bookmarks"
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 200
-  },
-  "right": {
-    "id": "cf92ccf43e96a53d",
-    "type": "split",
-    "children": [
-      {
-        "id": "4e6c94e5301f3341",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "86c23330f2a84cf8",
-            "type": "leaf",
-            "state": {
-              "type": "backlink",
-              "state": {
-                "file": "English/Homework/Homework 5.md",
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical",
-                "showSearch": false,
-                "searchQuery": "",
-                "backlinkCollapsed": false,
-                "unlinkedCollapsed": true
-              },
-              "icon": "links-coming-in",
-              "title": "Backlinks for Homework 5"
-            }
-          },
-          {
-            "id": "06e27be0fe382bd8",
-            "type": "leaf",
-            "state": {
-              "type": "all-properties",
-              "state": {
-                "sortOrder": "frequency",
-                "showSearch": false,
-                "searchQuery": ""
-              },
-              "icon": "lucide-archive",
-              "title": "All properties"
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 300,
-    "collapsed": true
-  },
-  "left-ribbon": {
-    "hiddenItems": {
-      "switcher:Меню быстрого перехода": false,
-      "graph:Граф": false,
-      "canvas:Создать новый холст": false,
-      "command-palette:Открыть палитру команд": false,
-      "markdown-importer:Импорт Markdown-файлов": false
-    }
-  },
-  "active": "aac30ac1aa814964",
-  "lastOpenFiles": [
-    "English/words.md",
-    "English/Homework/Homework 7.md",
-    "ROTEK/allwinner 069 070.md",
-    "common.md",
-    "ROTEK/bt67xx/common.md",
-    "STM32/Makefile template.md",
-    "todo/Разное.md",
-    "Python/venv.md",
-    "linux/server.md",
-    "todo/Задачи по направлениям.md",
-    "STM32/Makefile_template.txt",
-    "ROTEK/Arbiter, artery.md",
-    "ROTEK/Arbiter.md",
-    "linux/linux common.md",
-    "English/img/29-10.jpg.~tmp",
-    "English/img/29-9.jpg.~tmp",
-    "English/img/29-8.jpg.~tmp",
-    "English/img/29-7.jpg.~tmp",
-    "English/img/29-6.jpg.~tmp",
-    "English/img/29-5.jpg.~tmp",
-    "English/img/29-4.jpg.~tmp",
-    "English/img/29-3.jpg.~tmp",
-    "English/img/29-10.jpg",
-    "English/img/29-9.jpg",
-    "English/img/29-8.jpg",
-    "English/img/29-7.jpg",
-    "English/img/29-6.jpg",
-    "English/img/29-5.jpg",
-    "English/img/29-4.jpg",
-    "English/img/29-3.jpg",
-    "English/img/29-2.jpg",
-    "English/img/29-1.jpg",
-    "todo/Счета.md",
-    "todo/Тренировки и занятия.md",
-    "English/Homework/Homework 6.md",
-    "hardcore web development/11. SQL/Создание таблиц.md",
-    "English/Homework/Homework 5.md",
-    "ROTEK/Artery testing.md",
-    "Untitled.md",
-    "hardcore web development/11. SQL/JOIN/LEFT и RIGHT OUTER JOIN.md",
-    "Python/Архитектура.md",
-    "linux/Сценарий. Полная настройка Windows, WSL и инструментов для разработчика.md",
-    "hardcore web development/11. SQL/JOIN/INNER JOIN.md",
-    "Комментарии.md",
-    "hardcore web development/11. SQL/Дата и время.md",
-    "English/img/24-2.jpg.~tmp"
-  ]
+{
+  "main": {
+    "id": "702c86104f0a0629",
+    "type": "split",
+    "children": [
+      {
+        "id": "d32e90214846329f",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "9fcc05866a0efe94",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "ROTEK/allwinner 069 070.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "allwinner 069 070"
+            }
+          },
+          {
+            "id": "aac30ac1aa814964",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "English/Homework/Homework 7.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "Homework 7"
+            }
+          },
+          {
+            "id": "f2567d12b68b0d39",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "English/words.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "words"
+            }
+          }
+        ],
+        "currentTab": 1
+      }
+    ],
+    "direction": "vertical"
+  },
+  "left": {
+    "id": "6664e9908eeea5a2",
+    "type": "split",
+    "children": [
+      {
+        "id": "97095e32830cbc6f",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "c7584343712d3d31",
+            "type": "leaf",
+            "state": {
+              "type": "file-explorer",
+              "state": {
+                "sortOrder": "alphabetical",
+                "autoReveal": false
+              },
+              "icon": "lucide-folder-closed",
+              "title": "Файловый менеджер"
+            }
+          },
+          {
+            "id": "e389aabe146b0498",
+            "type": "leaf",
+            "state": {
+              "type": "search",
+              "state": {
+                "query": "",
+                "matchingCase": false,
+                "explainSearch": false,
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical"
+              },
+              "icon": "lucide-search",
+              "title": "Search"
+            }
+          },
+          {
+            "id": "5f649a68cfee8d78",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Python/SQLite.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "SQLite"
+            }
+          },
+          {
+            "id": "9cc940b45c7a4595",
+            "type": "leaf",
+            "state": {
+              "type": "bookmarks",
+              "state": {},
+              "icon": "lucide-bookmark",
+              "title": "Bookmarks"
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "horizontal",
+    "width": 200
+  },
+  "right": {
+    "id": "cf92ccf43e96a53d",
+    "type": "split",
+    "children": [
+      {
+        "id": "4e6c94e5301f3341",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "86c23330f2a84cf8",
+            "type": "leaf",
+            "state": {
+              "type": "backlink",
+              "state": {
+                "file": "English/Homework/Homework 5.md",
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical",
+                "showSearch": false,
+                "searchQuery": "",
+                "backlinkCollapsed": false,
+                "unlinkedCollapsed": true
+              },
+              "icon": "links-coming-in",
+              "title": "Backlinks for Homework 5"
+            }
+          },
+          {
+            "id": "06e27be0fe382bd8",
+            "type": "leaf",
+            "state": {
+              "type": "all-properties",
+              "state": {
+                "sortOrder": "frequency",
+                "showSearch": false,
+                "searchQuery": ""
+              },
+              "icon": "lucide-archive",
+              "title": "All properties"
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "horizontal",
+    "width": 300,
+    "collapsed": true
+  },
+  "left-ribbon": {
+    "hiddenItems": {
+      "switcher:Меню быстрого перехода": false,
+      "graph:Граф": false,
+      "canvas:Создать новый холст": false,
+      "command-palette:Открыть палитру команд": false,
+      "markdown-importer:Импорт Markdown-файлов": false
+    }
+  },
+  "active": "aac30ac1aa814964",
+  "lastOpenFiles": [
+    "English/words.md",
+    "English/Homework/Homework 7.md",
+    "ROTEK/allwinner 069 070.md",
+    "common.md",
+    "ROTEK/bt67xx/common.md",
+    "STM32/Makefile template.md",
+    "todo/Разное.md",
+    "Python/venv.md",
+    "linux/server.md",
+    "todo/Задачи по направлениям.md",
+    "STM32/Makefile_template.txt",
+    "ROTEK/Arbiter, artery.md",
+    "ROTEK/Arbiter.md",
+    "linux/linux common.md",
+    "English/img/29-10.jpg.~tmp",
+    "English/img/29-9.jpg.~tmp",
+    "English/img/29-8.jpg.~tmp",
+    "English/img/29-7.jpg.~tmp",
+    "English/img/29-6.jpg.~tmp",
+    "English/img/29-5.jpg.~tmp",
+    "English/img/29-4.jpg.~tmp",
+    "English/img/29-3.jpg.~tmp",
+    "English/img/29-10.jpg",
+    "English/img/29-9.jpg",
+    "English/img/29-8.jpg",
+    "English/img/29-7.jpg",
+    "English/img/29-6.jpg",
+    "English/img/29-5.jpg",
+    "English/img/29-4.jpg",
+    "English/img/29-3.jpg",
+    "English/img/29-2.jpg",
+    "English/img/29-1.jpg",
+    "todo/Счета.md",
+    "todo/Тренировки и занятия.md",
+    "English/Homework/Homework 6.md",
+    "hardcore web development/11. SQL/Создание таблиц.md",
+    "English/Homework/Homework 5.md",
+    "ROTEK/Artery testing.md",
+    "Untitled.md",
+    "hardcore web development/11. SQL/JOIN/LEFT и RIGHT OUTER JOIN.md",
+    "Python/Архитектура.md",
+    "linux/Сценарий. Полная настройка Windows, WSL и инструментов для разработчика.md",
+    "hardcore web development/11. SQL/JOIN/INNER JOIN.md",
+    "Комментарии.md",
+    "hardcore web development/11. SQL/Дата и время.md",
+    "English/img/24-2.jpg.~tmp"
+  ]
 }

English/words.md

@@ -168,3 +168,36 @@ poor - бедный
 to make ends meet - сводить концы с концами
 ~={yellow}Lesson 5=~
 chores - рутинная, неприятная работа/обязанности
+~={yellow}Unit 5. Lesson 1=~
+Christmas Day - the twenty-fifth of December
+Halloween - the thirty-first of October
+Saint Velentine's Day - the fourteenth of February
+Easter
+New Year - the first of January
+April Fool's Day - the first of April
+Bonfire Night - the fifth of November
+Victory Day - the ninth of May
+celebrate - to celebrate, to be celebrated
+Commemorete - to commemorate, to be commemorated
+Inttoduce - to introduce, to be introduced
+~={yellow}143=~
+stay up until midnight - не ложиться спать до полуночи
+see in - встречать
+strike - удар
+join hands - соединять руки
+follow a custom - соблюдать обычай
+knock at the door - стучать в дверь
+make New Year's Resulutions - давать обещания под новый год
+improve - улучшать, совершенствовать
+luck - удача, везение
+care about - волноваться, беспокоиться
+~={yellow}148 Прочитай=~
+anniversary - an anniversary - годовщина
+unfair - fair - unfair - справедливый - несправедливый
+to attend - посещать
+to blow up - взрывать
+next door to - по соседству, рядом
+question - to question - вопрос, спрашивать
+order - an order - to order - приказ, приказывать
+bonfire - костер
+commemorate - to commemorate - отмечать дату

Homework 8.md

@@ -0,0 +1,91 @@
+~={green}138 Ответь на вопросы, используй страдательный залог.=~
+1. Are many holidays celebrated in your country? - Many holidays are celebrated in our country.
+2. Were the special preparations made for the holiday? The special preparations are made for the holiday.
+3. When were the decorations put up? The decorations were put up over several weeks.
+4. What presents were usually bought for Christmal? Very different presents were bought for Christmas.
+5. Who was the house usually cleaned by? The house was usually cleaned by the whole family.
+6. What traditional holiday dishes are cooked in your family? Salad, meat and fish are cooked in your family.
+7. What were Christmas Trees usually decorated with? Christmas Trees were decorated with balls, garlands and tinsel. (шарики, гирлянды, мишура)
+8. Where were usually Christmas carols sung? Christmas carols were usually sung in the streets.
+9. Who was Christmas usually celebrated with? Christmas was usually celebrated with family.
+10. Were Christmas presents opened on Christamas morning or at midday? Christmas presents were usually opened at morning.
+
+~={green}139 Заполни пропуски предлогами with или by.=~
+1. The sauce was made with tomatoes and onions.
+2. The glass was filled with juice.
+3. The quiz was won by Steven.
+4. The cake was cut with a knife.
+5. The house was decorated with balloons.
+6. The flowers were brought by father.
+7. The cards were written by Ann.
+8. Traditional Christmas pudding was cooked by Granny.
+9. The presents were given by Santa Claus.
+10. The table was decirated with candles.
+11. The house was cleaned by mother.
+
+~={green}140 Поставь глагол в скобках в Past Simple Passive.=~
+1. Last year Nick was invited to Britain to celebrate Christmas.
+2. Money were collected for charity (благотворительность) before Christmas.
+3. Holiday songs and carols were heard in the streets and churches.
+4. The houses were decorated with evergreens to protect homes from evil spirits.
+5. Traditional roast turkey was cooked by mother and Granny.
+6. Christmas Tree was put up in the living room and decorated.
+7. The festive table (праздничный стол) was laid in the dining-room.
+8. Great family amusement (отличное семейное развлечение) was prepared before Chrismas.
+9. Christmas presents were packed and put under the Christmas Tree.
+10. Holiday cards were written and sent to many friends.
+11. The candles were lit (light) on the holiday table.
+12. The holiday were celebrated together with family and friends.
+
+~={green}141 Поставь глагол в скобках в Passive Voice=~
+1. - Did you have a nice time in Britain? - Oh, yes. We were taken to some places of interest and shown some exciting attractions.
+2. - Did To decorate his house himself? - No, it was decorated by his brother and sister.
+3. - What did you get for Christmas? - I was given the most beautiful pair of shoes I have ever had.
+4. - This cake tastes wonderful. - Thanks. It was made by my Granny.
+5. - That's a lovely dress. - It was given to me on my birthday.
+6. - When will your watch be ready? - I don't know. It wasn't fixed yet when I went to the repair shop yesterday.
+7. - How was the Christmas celebration? - It was lovely! The house was decorated with lights and balloons, the table was lit.
+8. - Look at this card! It's wonderful. - Yes, it was sent by Nick from London.
+9. - That's a beautiful sweater you are wearing! - Thank you. It was knitted by my aunt.
+10. - Did you send the Christmas card to Suise?
+11. - Yes, the card was made my Ann.
+
+~={green}146 Переведи.=~
+1. Письмо было написано на прошлой неделе. The letter was written last week.
+2. Дом был украшен гирляндами, огнями и шариками. The house was decorated with garlands, lights and balloons.
+3. Стол был накрыт к празднику. The table was lit for the holiday.
+4. Были ли друзья и родственники приглашены? Were friends and relatives invited?
+5. Вкусные блюда были приготовлены мамой и бабушкой. Delicious dishes was cooked by mother and grandmother.
+6. Подарки открывали до полуночи? Were presents opened before midnight.
+7. Квартиру убрали вчера вечером. The flat was cleaned last evening.
+8. Были ли цветы закуплены до начала праздника? Were flowers bought before the holiday?
+9. Салаты не были заказаны в ресторане. Salads were not ordered at the restaurant.
+10. Знания не были улучшены. Knowledge was not improved.
+11. Были ли сделаны новогодние обещания? Were Ney Year's resulutions made?
+12. Пожелания удачи были написаны и отосланы. Good luck wishes were written and sent.
+
+~={green}149 Переведи, используя Past Simple Passive и Present Simple Passive.=~
+1. The plot (заговор) against King James I was organized. (был организован)
+2. Bonfire Night is celebrated all over the UK.
+3. Unfair laws were not changed by King James I.
+4. The Protestant church wasn't vesited by the Roman Catholics.
+5. A house was bought next door to the Parliament.
+6. The Parliament wasn't blown up by the plotters (заговорщики).
+7. The plotters were arrested and interrogated.
+8. It was ordered to have a great bonfire on the night of the 5 of November.
+9. The event is celebrated annually in England.
+10. Money for fireworks are collected by children during the days before Bonfire Night.
+11. An effigy of Guy Fawkes was burnt and the traditional food was cooked in the fire.
+12. Traditional Parkin cake is eaten on Bonfire Night.
+
+~={green}150 Поставь вопрос к подлежащему.=~
+1. She told them an interestin story. Who told them an interesting story?
+2. We were shown a photo album. Who was shown a photo album?
+3. He asked the teacher to explain the rule. Who was asked the teacher to explain the rule?
+4. Mary was given a lot of flowers and presents. Who was given a lot of flowers and presents?
+5. Nick helped her to bring all the dishes to the kitchen. Whe was helped her to bring all the dishes to the kitchen?
+6. They were invited to his birthday party last week. Who was invited to his birthday party last week?
+7. The porter brought the luggage to our room. Who was brought the luggage to our room.
+8. Jim was sent to London last month. Who was sent to London to last month?
+9. Kate and Mary came to our garden party last week-end. Who was came to our garden party last week-end.
+10. The pictures were brought to the Russian Museum yesterday. What were brought to the Russian Museum yesterday?