Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.19' into 1.19
Browse files Browse the repository at this point in the history
  • Loading branch information
@Patbox
Patbox committed Oct 27, 2022
2 parents e16f5fa + 047e25a commit 2ea5b01
Show file tree
Hide file tree
Showing 35 changed files with 57 additions and 23 deletions.
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/ca@valencia.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/ca_ES.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/cs_CZ.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/de_DE.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/en@pirate.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/en_UD.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/es_AR.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/es_CL.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/es_EC.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/es_ES.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/es_MX.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/es_UY.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/es_VE.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/hu_HU.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/nb_NO.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/nl_NL.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/pl_PL.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/pt_BR.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/sl_SI.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions api/src/main/resources/data/server_translations_api/lang/zh_Hans.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions src/main/resources/data/server_translations/lang/ca@valencia.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions src/main/resources/data/server_translations/lang/ca_ES.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions src/main/resources/data/server_translations/lang/cs_CZ.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions src/main/resources/data/server_translations/lang/en@pirate.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions src/main/resources/data/server_translations/lang/es_AR.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions src/main/resources/data/server_translations/lang/es_CL.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions src/main/resources/data/server_translations/lang/es_EC.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions src/main/resources/data/server_translations/lang/es_MX.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions src/main/resources/data/server_translations/lang/es_UY.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions src/main/resources/data/server_translations/lang/es_VE.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions src/main/resources/data/server_translations/lang/nb_NO.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions src/main/resources/data/server_translations/lang/nl_NL.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions src/main/resources/data/server_translations/lang/pt_BR.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
46 changes: 23 additions & 23 deletions src/main/resources/data/server_translations/lang/ru_ru.json
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
"text.translated_server.loading.datapacks": "Перезагрузка менеджера ресурсов: %s",
"text.translated_server.loaded.recipe": "Загружено %s рецептов",
"text.translated_server.loaded.advancement": "Загружено %s достижений",
"text.translated_server.starting_version": "Запуск сервера Minecraft %s",
"text.translated_server.loading.properties": "Загрузка параметров",
"text.translated_server.loading.gamemode": "Режим игры по умолчанию: %s",
"text.translated_server.generate.keypair": "Создание ключевой пары",
"text.translated_server.loading.ip": "Запуск сервера Minecraft по адресу %1$s:%2$s",
"text.translated_server.preparing.level": "Подготовка мира «%s»",
"text.translated_server.preparing.dimension": "Подготовка начальной области измерения %s",
"text.translated_server.preparing.dimension.old": "Подготовка начальной области мира %s",
"text.translated_server.time": "Затраченное время: %s мс",
"text.translated_server.done": "Готово (%s)! Для вывода справки введите «help» ",
"text.translated_server.done.old": "Готово (%s)! Для вывода справки введите «help» или «?»",
"text.translated_server.save.chunks": "Сохранение чанков мира '%1$s'/%2$s",
"text.translated_server.save.players": "Сохранение игроков",
"text.translated_server.save.worlds": "Сохранение миров",
"text.translated_server.new.datapack": "Обнаружен новый набор данных %s; начата автоматическая загрузка",
"text.translated_server.force": "Нет активных наборов данных; активация стандартного набора",
"text.translated_server.saved": "ThreadedAnvilChunkStorage (%s): Все чанки сохранены",
"text.translated_server.progress.old": "Подготовка начальной области: %s%",
"text.translated_server.language.set": "Язык изменён на %1$s: %2$s (%3$s)"
}
"text.translated_server.loading.datapacks": "Перезагрузка менеджера ресурсов: %s",
"text.translated_server.loaded.recipe": "Загружено %s рецептов",
"text.translated_server.loaded.advancement": "Загружено %s достижений",
"text.translated_server.starting_version": "Запуск сервера Minecraft %s",
"text.translated_server.loading.properties": "Загрузка параметров",
"text.translated_server.loading.gamemode": "Режим игры по умолчанию: %s",
"text.translated_server.generate.keypair": "Создание ключевой пары",
"text.translated_server.loading.ip": "Запуск сервера Minecraft по адресу %1$s:%2$s",
"text.translated_server.preparing.level": "Подготовка мира «%s»",
"text.translated_server.preparing.dimension": "Подготовка начальной области измерения %s",
"text.translated_server.preparing.dimension.old": "Подготовка начальной области мира %s",
"text.translated_server.time": "Затраченное время: %s мс",
"text.translated_server.done": "Готово (%s)! Для вывода справки введите «help»",
"text.translated_server.done.old": "Готово (%s)! Для вывода справки введите «help» или «?»",
"text.translated_server.save.chunks": "Сохранение чанков мира '%1$s'/%2$s",
"text.translated_server.save.players": "Сохранение игроков",
"text.translated_server.save.worlds": "Сохранение миров",
"text.translated_server.new.datapack": "Обнаружен новый набор данных %s; начата автоматическая загрузка",
"text.translated_server.force": "Нет активных наборов данных; активация стандартного набора",
"text.translated_server.saved": "ThreadedAnvilChunkStorage (%s): Все чанки сохранены",
"text.translated_server.progress.old": "Подготовка начальной области: %s%",
"text.translated_server.language.set": "Язык изменён на %1$s: %2$s (%3$s)"
}
1 change: 1 addition & 0 deletions src/main/resources/data/server_translations/lang/sl_SI.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}

0 comments on commit 2ea5b01

Please sign in to comment.