dtelenkov 2 weeks ago
parent
commit
48d6583385
4 changed files with 94 additions and 69 deletions
  1. 16 68
      .obsidian/workspace.json
  2. BIN
      Database.kdbx
  3. 73 1
      English/Homework/Homework 9.md
  4. 5 0
      proGit.md

+ 16 - 68
.obsidian/workspace.json

@@ -8,35 +8,21 @@
         "type": "tabs",
         "children": [
           {
-            "id": "d71e50b2479be430",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "hardcore web development/11. SQL/Настройка.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "Настройка"
-            }
-          },
-          {
-            "id": "70f3bd476b3e1cbe",
+            "id": "f927c1f7ff8230e0",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "English/Homework/Homework 8.md",
+                "file": "proGit.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "Homework 8"
+              "title": "proGit"
             }
           },
           {
-            "id": "f927c1f7ff8230e0",
+            "id": "129da955faa7cd9e",
             "type": "leaf",
             "state": {
               "type": "markdown",
@@ -48,47 +34,9 @@
               "icon": "lucide-file",
               "title": "Homework 9"
             }
-          },
-          {
-            "id": "63e94bc195853314",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "linux/server.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "server"
-            }
-          },
-          {
-            "id": "added67700e66b56",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "hardcore web development/11. SQL/Настройка.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "Настройка"
-            }
-          },
-          {
-            "id": "93f97d4cb4342e03",
-            "type": "leaf",
-            "state": {
-              "type": "empty",
-              "state": {},
-              "icon": "lucide-file",
-              "title": "New tab"
-            }
           }
         ],
-        "currentTab": 2
+        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -111,7 +59,7 @@
                 "autoReveal": false
               },
               "icon": "lucide-folder-closed",
-              "title": "Files"
+              "title": "Файловый менеджер"
             }
           },
           {
@@ -211,17 +159,19 @@
   },
   "left-ribbon": {
     "hiddenItems": {
-      "switcher:Open quick switcher": false,
-      "graph:Open graph view": false,
-      "canvas:Create new canvas": false,
-      "command-palette:Open command palette": false,
-      "markdown-importer:Open format converter": false
+      "switcher:Меню быстрого перехода": false,
+      "graph:Граф": false,
+      "canvas:Создать новый холст": false,
+      "command-palette:Открыть палитру команд": false,
+      "markdown-importer:Импорт Markdown-файлов": false
     }
   },
-  "active": "f927c1f7ff8230e0",
+  "active": "129da955faa7cd9e",
   "lastOpenFiles": [
-    "English/Homework/Homework 8.md",
+    "proGit.md",
     "English/Homework/Homework 9.md",
+    "Database.kdbx.QABUnG",
+    "English/Homework/Homework 8.md",
     "English/Texts/Text 9.md",
     "Задания.md",
     "MySql vs Postgresql.md",
@@ -262,10 +212,8 @@
     "hardcore web development/11. SQL/JOIN/INNER JOIN.md",
     "lua/main.md",
     "lua",
-    "Кодинг.md",
     "Untitled.canvas",
     "English/img/34-10.jpg",
-    "docs/Galleon.pdf",
-    "docs/~$alleon.doc"
+    "docs/Galleon.pdf"
   ]
 }

BIN
Database.kdbx


+ 73 - 1
English/Homework/Homework 9.md

@@ -63,4 +63,76 @@
 6. The children weel watch TV. He said that the children would watch TV.
 7. We will need your help. He said that we would need your help.
 8. We will be at the meeting. He said that we would be at the meeting.
-9. He will go shopping today. He said that he would go shopping today.
+9. He will go shopping today. He said that he would go shopping today.
+
+~={green}180. Переведи предложения из прямой речи в косвенную.=~
+1. Ann said, "There is no one in the classroom". - Ann said that there was no one in the classroom.
+2. He said, "It's always cold at this time of the year". - He said that it was always cold at this time of the year.
+3. "I am going to the stadium now," said John. - John said that he was going to the stadium then.
+4. "There was a good drama on TV yesterday," mother said. - Mother said that there had been a good drama on TV the day before.
+5. "I will order pizza," my friend said. - My friend said that he would order pizza.
+6. "George has never seen a crocodile before," Kate said. - Kate said that George had never seen a crocodile before.
+7. "I have a headache," Catherine said. - Catherine said that sha had a headache.
+8. "There was a holiday yesterday," he said. - He said that there had been a holiday the day before.
+9. "I got a letter from Mike this morning," she said. - She said that she had gotten a letter from Mike that morning.
+10. "I am going to the airport to pick up James," he said. - He said that he was going to the airport to pick up James.
+11. "Mary speaks French fluently," they said. - The said that Mary spoke French Fluently.
+12. "I have just finished reading an interesting book," he said. - He said that he had just finished reading an interesint book.
+
+~={green}181. Переведи предложения из прямой речи в косвенную=~
+1. "This film is very funny," Lucy said. - Lucy said that film was very funny.
+2. "That was a wonderful party," Jane said. - Jane said that had been a wonderful party.
+3. "A lot of people visit museumes," he said. He said that a lot of people visited museums.
+4. "I don't like this dress," Laura said. - Laura said that she didn't like this dress.
+5. "Bob promised to organize the music for the party," they said. - They said that Bob had promised to organize the music for the party.
+6. "There is too much violence (насилие) on TV," said Granddad. - Granddad said that there was too much violence on TV.
+7. "I won't be late again," he said. - He said that he didn't want to be late again.
+8. "You will see the hotel on your left," she said. - She said that you would see the hotel on your left.
+9. "We had the holiday of a lifetime," they said. - They said that they had the holiday of a lifetime. (Здесь не понял).
+10. "They visited the Tower Bridge and the Buckingham Palace," Ann said. - Ann said that they had visited the Tower Bridge and the Buckingham Palace.
+11. "It is a lovely place," Mike said. - Mike said that it was a lovely place.
+12. "The city is very exciting and has some famous traditions," the guide said. - The guide said that the city was very exiting and had some famous traditions.
+
+~={green}182. Исправь ошибку.=~
+1. He said that hi was busy.
+2. Mike said that they had finished their work.
+3. Mother said that the boys were playing football in the yard.
+4. We informed our teacher that we would takt part in the concert.
+5. I promised my brother that we would go to the Zoo.
+6. Jane said that the car had repaired two weeks before.
+7. He said that they had played football the day before.
+8. Father promised that he would take us to a picnic the next day.
+9. My Granny said that it had happened two years before.
+10. Tom said that he had been to Moscow the Sunday before. (не понял).
+11. They said that I broke their window.
+12. Sue said that she had found this note under the sofa.
+
+~={green}183. Подчеркни правильный вариант.=~
+1. He said that there was no one at home.
+2. He said that Mr. and Mrs. Brown had hone on holiday.
+3. She said that it was laways hot at that time of the year.
+4. They said that they had seen the film before.
+5. The teacher said that the sun have rises in the east.
+6. She said that she was going to the dentist at that moment.
+7. Nick said that there had been a food film on TV the day before.
+8. Father said he had never caught such a big fish before.
+9. Mr.Smith said that he was looking at my plans at that moment.
+10. Paul said that I could find a lot of information on the internet.
+11. Liza told Granny that she would help her with the gardening.
+12. Cindy said that she would invite Mike to her party the day after.
+
+~={green}184. Передай предложения в косвенной речи.=~
+1. My friend said that I would win the race.
+2. Mary said that she liked figure-skating very much.
+3. She said that she was going on holiday next week.
+4. Mike said that Nick had been at a football match the day before.
+5. The girls said that they had gone to the stadium to play volleyball two days before.
+6. His friend said that Ted didn't really like the results of the game.
+7. The children said that John was the best runner in our class.
+8. Sue said that Tom had run faster than than Paul at the comprtition the day before.
+9. Mother said that Helen had left the house early in the morning.
+10. They said that Sally had played tennis with Nick on Friday.
+11. They said that he had been the best footballer of the decade.
+12. Nina said that he had already discussed the results of the football match.
+
+~={green}185. Перепиши предложения в косвенной речи.=~

+ 5 - 0
proGit.md

@@ -77,6 +77,11 @@ $ git push origin --delete <tagname>
 $ git checkout --theirs <path to file>
 ```
 
+Переключиться на версию файла из другой ветки (branch_name)
+```bash
+$ git checkout <branch_name> -- <file_name>
+```
+
 Убрать отслеживание изменений на права доступа
 ```bash
 $ git config core.filemode false