Skip to content

Fix small issues #2821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 22, 2022
Merged

Fix small issues #2821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4a704dc
Fix typo
patiencedaur Apr 22, 2022
65a987d
Fix typo
patiencedaur Apr 22, 2022
8769b82
Remove confusing sentence
patiencedaur Apr 22, 2022
2281c1d
Correct rocks install description
patiencedaur Apr 22, 2022
0bde407
Clarify example
patiencedaur Apr 22, 2022
e8ea283
Provide a better term translation
patiencedaur Apr 22, 2022
9f362cc
Fix typo
patiencedaur Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions doc/reference/reference_lua/box_space/on_replace.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ space_object:on_replace()

.. code-block:: tarantoolsession

tarantool> function f ()
tarantool> x = 0
> function f ()
> x = x + 1
> end
tarantool> box.space.X:on_replace(f)
tarantool> box.space.my_space_name:on_replace(f)

**Example 2:**

Expand Down
2 changes: 0 additions & 2 deletions doc/reference/reference_lua/clock.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ Below is a list of all ``clock`` functions.
realtime64()

The wall clock time. Derived from C function clock_gettime(CLOCK_REALTIME).
This is the best function for knowing what the official time is, as
determined by the system administrator.

:return: seconds or nanoseconds since epoch (1970-01-01 00:00:00), adjusted.
:rtype: number or number64
Expand Down
2 changes: 1 addition & 1 deletion doc/reference/tarantoolctl.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Commands for managing Tarantool modules
Initialize a directory for a Lua project using LuaRocks. Since version :doc:`2.4.1 </release/2.4.1>`.

``tarantoolctl rocks install NAME``
Install a module in the current directory.
Install a module in the ``.rocks`` directory, nested in the current directory.

``tarantoolctl rocks lint FILE``
Check the syntax of a rockspec. Since version :doc:`2.4.1 </release/2.4.1>`.
Expand Down
10 changes: 6 additions & 4 deletions locale/ru/LC_MESSAGES/reference/reference_lua/box_space/on_replace.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,17 @@ msgid "**Example 1:**"
msgstr "**Пример 1:**"

msgid ""
"tarantool> function f ()\n"
"tarantool> x = 0\n"
" > function f ()\n"
" > x = x + 1\n"
" > end\n"
"tarantool> box.space.X:on_replace(f)"
"tarantool> box.space.my_space_name:on_replace(f)"
msgstr ""
"tarantool> function f ()\n"
"tarantool> x = 0\n"
" > function f ()\n"
" > x = x + 1\n"
" > end\n"
"tarantool> box.space.X:on_replace(f)"
"tarantool> box.space.my_space_name:on_replace(f)"

msgid "**Example 2:**"
msgstr "**Пример 2:**"
Expand Down
8 changes: 2 additions & 6 deletions locale/ru/LC_MESSAGES/reference/reference_lua/clock.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,10 @@ msgid "Measure the time a function takes within a processor"
msgstr "Измерение времени, которое функция проводит в процессоре"

msgid ""
"The wall clock time. Derived from C function clock_gettime(CLOCK_REALTIME). "
"This is the best function for knowing what the official time is, as "
"determined by the system administrator."
"The wall clock time. Derived from C function clock_gettime(CLOCK_REALTIME)."
msgstr ""
"Физическое время в секундах. Получено из C-функции "
"clock_gettime(CLOCK_REALTIME). Использование этой функции лучше всего "
"подходит для выяснения официального времени, как установлено системным "
"администратором."
"clock_gettime(CLOCK_REALTIME)."

msgid "return"
msgstr "возвращает"
Expand Down
8 changes: 4 additions & 4 deletions locale/ru/LC_MESSAGES/reference/reference_lua/json_paths.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ msgid ""
msgstr ""
"Они расходуют меньше места в WAL, потому что для обновления хранятся только "
"ключи, операции и аргументы. Обновление одного труднодоступного поля "
"дешевле, чем всего обновление всего кортежа."
"дешевле, чем обновление всего кортежа."

msgid ""
"They are faster. Firstly, this is because they are implemented in C, and "
Expand All @@ -200,6 +200,6 @@ msgstr ""
"Они доступны с удаленных клиентов, а также с любого другого DML. До того, "
"как обновления с помощью JSON-путей стали доступны в Tarantool, чтобы "
"обновить одну глубокую часть кортежа, нужно было скачать этот кортеж, "
"обновить его в памяти и отправить обратно - 2 сетевых скачка. С помощью "
"JSON-путей, это может быть 1 скачок, когда обновление может быть описано в "
"путях."
"обновить его в памяти и отправить обратно --- 2 сетевых хопа. Если применяются "
"JSON-пути, обновление может быть описано в "
"путях и занять 1 хоп."
2 changes: 1 addition & 1 deletion locale/ru/LC_MESSAGES/reference/reference_lua/log.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ msgstr "название модуля,"
msgid ""
"'E', 'W', 'I', 'V' or 'D' depending on ``log_level_function_name``, and"
msgstr ""
", 'W', 'I', 'V' или 'D' в зависимости от ``log_level_function_name`` и"
"'E', 'W', 'I', 'V' или 'D' в зависимости от ``log_level_function_name`` и"

msgid "``message``."
msgstr "``сообщение``."
Expand Down
2 changes: 1 addition & 1 deletion locale/ru/LC_MESSAGES/reference/reference_rock/vshard/vshard_api.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ msgid ""
"not log a warning. In case you need that behavior."
msgstr ""
"``vshard.router.bucket_id_strcrc32()`` имеет такое же поведение, но не "
"записывает предупреждение. Для случаев, когда такое поведение действитльно "
"записывает предупреждение. Для случаев, когда такое поведение действительно "
"необходимо."

msgid "Calculate the bucket id using a simple built-in hash function."
Expand Down
4 changes: 2 additions & 2 deletions locale/ru/LC_MESSAGES/reference/tarantoolctl.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,8 @@ msgstr ""
msgid "``tarantoolctl rocks install NAME``"
msgstr "``tarantoolctl rocks install NAME``"

msgid "Install a module in the current directory."
msgstr "Установка модуля в текущей директории."
msgid "Install a module in the ``.rocks`` directory, nested in the current directory."
msgstr "Установка модуля в директорию ``.rocks``, находящуюся в текущей директории."

msgid "``tarantoolctl rocks lint FILE``"
msgstr ""
Expand Down