Skip to content

Commit d4b3c00

Browse files
committed
add info about revert
1 parent a538498 commit d4b3c00

File tree

4 files changed

+87
-52
lines changed

4 files changed

+87
-52
lines changed

docs/common_information/introduction.rst

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ Practice
1717
- Additionally, each repository includes an example of a properly formatted PULL REQUEST.
1818
- Submission of all tasks is mandatory to pass the course.
1919
- A task that has been merged into the master branch continues to be monitored.
20-
If a task fails in the master, it is disabled, and a record of this is added to the score table. All disabled tasks will result in a zero points result for those tasks at the end of the semester.
20+
If a task fails in the master, it is disabled, and a record of this is added to the score table.
21+
All disabled tasks will result in a zero points result for those tasks at the end of the semester.
22+
It can be seen that your task is disabled due to the following reason: the directory of your task has been renamed
23+
from ``seq/nesterov_a_vector_sum`` to ``seq/nesterov_a_vector_sum_disabled``
2124
- All resources for using the repository will be provided here:
2225

2326
- `Git for half an hour: A Beginner’s Guide <https://proglib.io/p/git-for-half-an-hour>`__

docs/locale/en/LC_MESSAGES/common_information/introduction.po

+34-19
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ msgid ""
99
msgstr ""
1010
"Project-Id-Version: Parallel Programming Course \n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2025-02-05 13:29+0100\n"
12+
"POT-Creation-Date: 2025-02-09 00:23+0100\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1515
"Language: en\n"
@@ -79,104 +79,119 @@ msgid ""
7979
"A task that has been merged into the master branch continues to be "
8080
"monitored. If a task fails in the master, it is disabled, and a record of"
8181
" this is added to the score table. All disabled tasks will result in a "
82-
"zero points result for those tasks at the end of the semester."
82+
"zero points result for those tasks at the end of the semester. It can be "
83+
"seen that your task is disabled due to the following reason: the "
84+
"directory of your task has been renamed from "
85+
"``seq/nesterov_a_vector_sum`` to ``seq/nesterov_a_vector_sum_disabled``"
8386
msgstr ""
8487

85-
#: ../../common_information/introduction.rst:21
88+
#: ../../common_information/introduction.rst:24
8689
msgid "All resources for using the repository will be provided here:"
8790
msgstr ""
8891

89-
#: ../../common_information/introduction.rst:23
92+
#: ../../common_information/introduction.rst:26
9093
msgid ""
9194
"`Git for half an hour: A Beginner’s Guide <https://proglib.io/p/git-for-"
9295
"half-an-hour>`__"
9396
msgstr ""
9497

95-
#: ../../common_information/introduction.rst:24
98+
#: ../../common_information/introduction.rst:27
9699
#, python-format
97100
msgid ""
98101
"`Getting Started with Git and GitHub: A Beginner’s Guide "
99102
"<https://medium.com/nuances-of-"
100103
"programming/%D0%B7%D0%BD%D0%B0%D0%BA%D0%BE%D0%BC%D1%81%D1%82%D0%B2%D0%BE-%D1%81-git-%D0%B8-github-%D1%80%D1%83%D0%BA%D0%BE%D0%B2%D0%BE%D0%B4%D1%81%D1%82%D0%B2%D0%BE-%D0%B4%D0%BB%D1%8F-%D0%BD%D0%B0%D1%87%D0%B8%D0%BD%D0%B0%D1%8E%D1%89%D0%B8%D1%85-54ea2567d76c>`__"
101104
msgstr ""
102105

103-
#: ../../common_information/introduction.rst:25
106+
#: ../../common_information/introduction.rst:28
104107
msgid ""
105108
"`Git: A Quick Start Guide to Using Core Operations with Explanations "
106109
"<https://tproger.ru/translations/git-quick-start/>`__"
107110
msgstr ""
108111

109-
#: ../../common_information/introduction.rst:26
112+
#: ../../common_information/introduction.rst:29
110113
msgid ""
111114
"`Conflicts resolving in Git "
112115
"<https://githowto.com/ru/resolving_conflicts>`__"
113116
msgstr ""
114117

115-
#: ../../common_information/introduction.rst:27
118+
#: ../../common_information/introduction.rst:30
116119
msgid "`Google testing framework (gtest) <https://habr.com/ru/post/119090/>`__"
117120
msgstr ""
118121

119-
#: ../../common_information/introduction.rst:28
122+
#: ../../common_information/introduction.rst:31
120123
msgid ""
121124
"`GoogleTest Primer "
122125
"<https://github.com/google/googletest/blob/main/docs/primer.md>`__"
123126
msgstr ""
124127

125-
#: ../../common_information/introduction.rst:29
128+
#: ../../common_information/introduction.rst:32
126129
msgid "`GitHub Actions documentation <https://docs.github.com/ru/actions>`__"
127130
msgstr ""
128131

129-
#: ../../common_information/introduction.rst:30
132+
#: ../../common_information/introduction.rst:33
130133
msgid ""
131134
"`Parallel Programming Technologies. Message Passing Interface (MPI) "
132135
"<https://parallel.ru/vvv/mpi.html#p1>`__"
133136
msgstr ""
134137

135-
#: ../../common_information/introduction.rst:31
138+
#: ../../common_information/introduction.rst:34
136139
msgid ""
137140
"`Typing and Layout in the System LaTeX <https://www.mccme.ru/free-"
138141
"books/llang/newllang.pdf>`__"
139142
msgstr ""
140143

141-
#: ../../common_information/introduction.rst:32
144+
#: ../../common_information/introduction.rst:35
142145
msgid ""
143146
"`LaTeX for the beginners "
144147
"<https://web.archive.org/web/20210420184700/http://www.docs.is.ed.ac.uk/skills/documents/3722/3722-2014.pdf>`__"
145148
msgstr ""
146149

147-
#: ../../common_information/introduction.rst:33
150+
#: ../../common_information/introduction.rst:36
148151
msgid "`What is OpenMP? <https://parallel.ru/tech/tech_dev/openmp.html>`__"
149152
msgstr ""
150153

151-
#: ../../common_information/introduction.rst:34
154+
#: ../../common_information/introduction.rst:37
152155
msgid ""
153156
"`TBB-1 "
154157
"<https://web.archive.org/web/20220406024622/http://www.unn.ru/pages/e-library/aids/2007/12.pdf>`__"
155158
msgstr ""
156159

157-
#: ../../common_information/introduction.rst:35
160+
#: ../../common_information/introduction.rst:38
158161
msgid ""
159162
"`Writing Multithreaded Applications in C++ <https://eax.me/cpp-"
160163
"multithreading/>`__"
161164
msgstr ""
162165

163-
#: ../../common_information/introduction.rst:36
166+
#: ../../common_information/introduction.rst:39
164167
msgid ""
165168
"`Multithreading: New Features of the C++11 Standard "
166169
"<https://web.archive.org/web/20200608173050/http://www.quizful.net/post"
167170
"/multithreading-cpp11>`__"
168171
msgstr ""
169172

170-
#: ../../common_information/introduction.rst:37
173+
#: ../../common_information/introduction.rst:40
171174
msgid ""
172175
"`Introduction to Parallel Computing "
173176
"<http://ikt.muctr.ru/images/info/2Lecture_3.pdf>`__"
174177
msgstr ""
175178

176-
#: ../../common_information/introduction.rst:39
179+
#: ../../common_information/introduction.rst:42
177180
msgid ""
178181
"\\* *All instructions, repositories, and tables may be updated during the"
179182
" learning process for better usability. Be prepared for changes, check "
180183
"and update them periodically!!!*"
181184
msgstr ""
182185

186+
#~ msgid ""
187+
#~ "A task that has been merged into"
188+
#~ " the master branch continues to be"
189+
#~ " monitored. If a task fails in "
190+
#~ "the master, it is disabled, and a"
191+
#~ " record of this is added to the"
192+
#~ " score table. All disabled tasks will"
193+
#~ " result in a zero points result "
194+
#~ "for those tasks at the end of "
195+
#~ "the semester."
196+
#~ msgstr ""
197+

docs/locale/ru/LC_MESSAGES/common_information/introduction.po

+49-31
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ msgid ""
99
msgstr ""
1010
"Project-Id-Version: Parallel Programming Course \n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2025-02-05 13:29+0100\n"
12+
"POT-Creation-Date: 2025-02-09 00:23+0100\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1515
"Language: ru\n"
@@ -57,13 +57,17 @@ msgstr "Распределение задач производится случ
5757
msgid ""
5858
"An example for each technology can be found in the corresponding "
5959
"directory: ``tasks/<all/omp/tbb/seq/stl/mpi>/example``."
60-
msgstr "Пример для каждой технологии находится в директории: ``tasks/<all/omp/tbb/seq/stl/mpi>/example``."
60+
msgstr ""
61+
"Пример для каждой технологии находится в директории: "
62+
"``tasks/<all/omp/tbb/seq/stl/mpi>/example``."
6163

6264
#: ../../common_information/introduction.rst:16
6365
msgid ""
6466
"In each repository, the README.md contains a link to the course "
6567
"documentation (**read it fully!!!**)."
66-
msgstr "В каждом из репозиториев в README.md находится документация курса (просьба читать полностью!!!)"
68+
msgstr ""
69+
"В каждом из репозиториев в README.md находится документация курса "
70+
"(просьба читать полностью!!!)"
6771

6872
#: ../../common_information/introduction.rst:17
6973
msgid ""
@@ -80,106 +84,118 @@ msgid ""
8084
"A task that has been merged into the master branch continues to be "
8185
"monitored. If a task fails in the master, it is disabled, and a record of"
8286
" this is added to the score table. All disabled tasks will result in a "
83-
"zero points result for those tasks at the end of the semester."
84-
msgstr "Задача, которая оказывается в мастер-ветке, продолжает проверяться. "
85-
"Если задача упала (падение теста) в мастере, она отключается, и запись об этом добавляется в таблицу результатов. "
86-
"Все отключенные (не исправленные) задания в конце семестра приведут к обнулению баллов за их выподнение"
87+
"zero points result for those tasks at the end of the semester. It can be "
88+
"seen that your task is disabled due to the following reason: the "
89+
"directory of your task has been renamed from "
90+
"``seq/nesterov_a_vector_sum`` to ``seq/nesterov_a_vector_sum_disabled``"
91+
msgstr ""
92+
"Задача, которая оказывается в мастер-ветке, продолжает проверяться. Если "
93+
"задача упала (падение теста) в мастере, она отключается, и запись об этом"
94+
" добавляется в таблицу результатов. Все отключенные (не исправленные) "
95+
"задания в конце семестра приведут к обнулению баллов за их выполнение. "
96+
"Можно увидеть, что ваша задача является отключенной, по следующему признаку: "
97+
"имя директории вашей задачи будет изменено с "
98+
"``seq/nesterov_a_vector_sum`` на ``seq/nesterov_a_vector_sum_disabled``"
8799

88-
#: ../../common_information/introduction.rst:21
100+
#: ../../common_information/introduction.rst:24
89101
msgid "All resources for using the repository will be provided here:"
90102
msgstr "Все материалы по использованию репозитория будут представлены здесь:"
91103

92-
#: ../../common_information/introduction.rst:23
104+
#: ../../common_information/introduction.rst:26
93105
msgid ""
94106
"`Git for half an hour: A Beginner’s Guide <https://proglib.io/p/git-for-"
95107
"half-an-hour>`__"
96-
msgstr "`Git за полчаса: руководство для начинающих <https://proglib.io/p/git-for-half-an-hour>`__"
108+
msgstr ""
109+
"`Git за полчаса: руководство для начинающих <https://proglib.io/p/git-"
110+
"for-half-an-hour>`__"
97111

98-
#: ../../common_information/introduction.rst:24
112+
#: ../../common_information/introduction.rst:27
99113
#, python-format
100114
msgid ""
101115
"`Getting Started with Git and GitHub: A Beginner’s Guide "
102116
"<https://medium.com/nuances-of-"
103117
"programming/%D0%B7%D0%BD%D0%B0%D0%BA%D0%BE%D0%BC%D1%81%D1%82%D0%B2%D0%BE-%D1%81-git-%D0%B8-github-%D1%80%D1%83%D0%BA%D0%BE%D0%B2%D0%BE%D0%B4%D1%81%D1%82%D0%B2%D0%BE-%D0%B4%D0%BB%D1%8F-%D0%BD%D0%B0%D1%87%D0%B8%D0%BD%D0%B0%D1%8E%D1%89%D0%B8%D1%85-54ea2567d76c>`__"
104-
msgstr "`Знакомство с Git и GitHub: руководство для начинающих "
118+
msgstr ""
119+
"`Знакомство с Git и GitHub: руководство для начинающих "
105120
"<https://medium.com/nuances-of-"
106121
"programming/%D0%B7%D0%BD%D0%B0%D0%BA%D0%BE%D0%BC%D1%81%D1%82%D0%B2%D0%BE-%D1%81-git-%D0%B8-github-%D1%80%D1%83%D0%BA%D0%BE%D0%B2%D0%BE%D0%B4%D1%81%D1%82%D0%B2%D0%BE-%D0%B4%D0%BB%D1%8F-%D0%BD%D0%B0%D1%87%D0%B8%D0%BD%D0%B0%D1%8E%D1%89%D0%B8%D1%85-54ea2567d76c>`__"
107122

108-
#: ../../common_information/introduction.rst:25
123+
#: ../../common_information/introduction.rst:28
109124
msgid ""
110125
"`Git: A Quick Start Guide to Using Core Operations with Explanations "
111126
"<https://tproger.ru/translations/git-quick-start/>`__"
112127
msgstr ""
113128
"`Git. Быстрый старт по использованию основных операций с объяснениями "
114129
"<https://tproger.ru/translations/git-quick-start/>`__"
115130

116-
#: ../../common_information/introduction.rst:26
131+
#: ../../common_information/introduction.rst:29
117132
msgid ""
118133
"`Conflicts resolving in Git "
119134
"<https://githowto.com/ru/resolving_conflicts>`__"
120135
msgstr ""
121136
"`Разрешение конфликтов в Git "
122137
"<https://githowto.com/ru/resolving_conflicts>`__"
123138

124-
#: ../../common_information/introduction.rst:27
139+
#: ../../common_information/introduction.rst:30
125140
msgid "`Google testing framework (gtest) <https://habr.com/ru/post/119090/>`__"
126141
msgstr ""
127142

128-
#: ../../common_information/introduction.rst:28
143+
#: ../../common_information/introduction.rst:31
129144
msgid ""
130145
"`GoogleTest Primer "
131146
"<https://github.com/google/googletest/blob/main/docs/primer.md>`__"
132147
msgstr ""
133148

134-
#: ../../common_information/introduction.rst:29
149+
#: ../../common_information/introduction.rst:32
135150
msgid "`GitHub Actions documentation <https://docs.github.com/ru/actions>`__"
136151
msgstr "`GitHub Actions документация <https://docs.github.com/ru/actions>`__"
137152

138-
#: ../../common_information/introduction.rst:30
153+
#: ../../common_information/introduction.rst:33
139154
msgid ""
140155
"`Parallel Programming Technologies. Message Passing Interface (MPI) "
141156
"<https://parallel.ru/vvv/mpi.html#p1>`__"
142157
msgstr ""
143-
"`Технологии параллельного программирования. Message Passing Interface (MPI) "
144-
"<https://parallel.ru/vvv/mpi.html#p1>`__"
158+
"`Технологии параллельного программирования. Message Passing Interface "
159+
"(MPI) <https://parallel.ru/vvv/mpi.html#p1>`__"
145160

146-
#: ../../common_information/introduction.rst:31
161+
#: ../../common_information/introduction.rst:34
147162
msgid ""
148163
"`Typing and Layout in the System LaTeX <https://www.mccme.ru/free-"
149164
"books/llang/newllang.pdf>`__"
150165
msgstr ""
151166
"`Набор и вёрстка в системе LaTeX <https://www.mccme.ru/free-"
152167
"books/llang/newllang.pdf>`__"
153168

154-
#: ../../common_information/introduction.rst:32
169+
#: ../../common_information/introduction.rst:35
155170
msgid ""
156171
"`LaTeX for the beginners "
157172
"<https://web.archive.org/web/20210420184700/http://www.docs.is.ed.ac.uk/skills/documents/3722/3722-2014.pdf>`__"
158173
msgstr ""
159174
"`LaTeX для начинающих "
160175
"<https://web.archive.org/web/20210420184700/http://www.docs.is.ed.ac.uk/skills/documents/3722/3722-2014.pdf>`__"
161176

162-
#: ../../common_information/introduction.rst:33
177+
#: ../../common_information/introduction.rst:36
163178
msgid "`What is OpenMP? <https://parallel.ru/tech/tech_dev/openmp.html>`__"
164179
msgstr "`Что такое OpenMP? <https://parallel.ru/tech/tech_dev/openmp.html>`__"
165180

166-
#: ../../common_information/introduction.rst:34
181+
#: ../../common_information/introduction.rst:37
167182
msgid ""
168183
"`TBB-1 "
169184
"<https://web.archive.org/web/20220406024622/http://www.unn.ru/pages/e-library/aids/2007/12.pdf>`__"
170185
msgstr ""
171-
"`Средства разработки параллельных программ для систем с общей памятью. Библиотека Intel Threading Building Blocks "
186+
"`Средства разработки параллельных программ для систем с общей памятью. "
187+
"Библиотека Intel Threading Building Blocks "
172188
"<https://web.archive.org/web/20220406024622/http://www.unn.ru/pages/e-library/aids/2007/12.pdf>`__"
173189

174-
#: ../../common_information/introduction.rst:35
190+
#: ../../common_information/introduction.rst:38
175191
msgid ""
176192
"`Writing Multithreaded Applications in C++ <https://eax.me/cpp-"
177193
"multithreading/>`__"
178194
msgstr ""
179195
"`Написание многопоточных приложений на C++ <https://eax.me/cpp-"
180196
"multithreading/>`__"
181197

182-
#: ../../common_information/introduction.rst:36
198+
#: ../../common_information/introduction.rst:39
183199
msgid ""
184200
"`Multithreading: New Features of the C++11 Standard "
185201
"<https://web.archive.org/web/20200608173050/http://www.quizful.net/post"
@@ -189,19 +205,21 @@ msgstr ""
189205
"<https://web.archive.org/web/20200608173050/http://www.quizful.net/post"
190206
"/multithreading-cpp11>`__"
191207

192-
#: ../../common_information/introduction.rst:37
208+
#: ../../common_information/introduction.rst:40
193209
msgid ""
194210
"`Introduction to Parallel Computing "
195211
"<http://ikt.muctr.ru/images/info/2Lecture_3.pdf>`__"
196212
msgstr ""
197213
"`Введение в параллельные вычисления "
198214
"<http://ikt.muctr.ru/images/info/2Lecture_3.pdf>`__"
199215

200-
#: ../../common_information/introduction.rst:39
216+
#: ../../common_information/introduction.rst:42
201217
msgid ""
202218
"\\* *All instructions, repositories, and tables may be updated during the"
203219
" learning process for better usability. Be prepared for changes, check "
204220
"and update them periodically!!!*"
205221
msgstr ""
206-
"\\* *Все инструкции, репозитории и таблицы могут быть изменены в ходе учебного процесса "
207-
"для более удобного использования, будьте готовы к изменениям и периодически проверяйте это!!!!!!*"
222+
"\\* *Все инструкции, репозитории и таблицы могут быть изменены в ходе "
223+
"учебного процесса для более удобного использования, будьте готовы к "
224+
"изменениям и периодически проверяйте это!!!!!!*"
225+

docs/locale/ru/LC_MESSAGES/common_information/points.po

-1
Original file line numberDiff line numberDiff line change
@@ -297,4 +297,3 @@ msgid ""
297297
"Please keep in mind that one week before the end of the semester, the "
298298
"repository will be closed for final assessment."
299299
msgstr "Просьба иметь ввиду, что за неделю до конца семестра репозиторий будет закрыт для подведения окончательных итогов."
300-

0 commit comments

Comments
 (0)