Merge remote-tracking branch 'shedaniel/l10n_3.x' into 3.x

2 files changed, 15 insertions, 15 deletions

diff --git a/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json b/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json
index f09cc9842..6df25eec4 100755
--- a/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json
+++ b/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json
@@ -82,8 +82,8 @@
   "text.rei.recipe_screen_type.selection": "Écran de sélection du type d'affichage des recettes",
   "text.rei.recipe_screen_type.selection.sub": "Vous pouvez toujours changer cette option dans l'écran de configuration.",
   "text.rei.view_recipes_for": "Voir les recettes de %s",
-  "tooltip.rei.fluid_amount": "§7%d Unit",
-  "msg.rei.copied_recipe_id": "ID de la recette copié",
+  "tooltip.rei.fluid_amount": "§7%d unités",
+  "msg.rei.copied_recipe_id": "Identifiant de la recette copié",
   "msg.rei.recipe_id_details": "ID de recette : %s",
   "_comment": "Info-bulles de configuration",
   "config.roughlyenoughitems.title": "Configuration de Roughly Enough Items",
@@ -99,7 +99,7 @@
   "config.roughlyenoughitems.nextPageKeybind": "Page suivante :",
   "config.roughlyenoughitems.previousPageKeybind": "Page précédente :",
   "config.roughlyenoughitems.focusSearchFieldKeybind": "Focus Search Field:",
-  "config.roughlyenoughitems.copyRecipeIdentifierKeybind": "Copier l'ID de la recette :",
+  "config.roughlyenoughitems.copyRecipeIdentifierKeybind": "Copier l'identifiant de la recette :",
   "config.roughlyenoughitems.favoriteKeybind": "Favorite Entry:",
   "config.roughlyenoughitems.favoritesEnabled": "Favoris activés :",
   "config.roughlyenoughitems.clickableRecipeArrows": "Flèches de recette cliquables :",
@@ -160,7 +160,7 @@
   "config.roughlyenoughitems.displayFavoritesOnTheLeft.boolean.false": "Haut de la liste",
   "config.roughlyenoughitems.displayFavoritesTooltip": "Afficher les info-bulles des favoris :",
   "config.roughlyenoughitems.snapToRows": "Entry List Snap To Rows:",
-  "config.roughlyenoughitems.toastDisplayedOnCopyIdentifier": "Copy Identifier Toast:",
+  "config.roughlyenoughitems.toastDisplayedOnCopyIdentifier": "Copier l'identifiant de la notification :",
   "config.roughlyenoughitems.scrollingEntryListWidget": "Entry List Action:",
   "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "Défilement",
   "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "Pagination",
diff --git a/src/main/resources/assets/roughlyenoughitems/lang/ru_ru.json b/src/main/resources/assets/roughlyenoughitems/lang/ru_ru.json
index 120f6cd3d..92cb509f2 100644
--- a/src/main/resources/assets/roughlyenoughitems/lang/ru_ru.json
+++ b/src/main/resources/assets/roughlyenoughitems/lang/ru_ru.json
@@ -1,5 +1,5 @@
 {
-  "key.rei.category": "Roughly Enough Items (Set Modifiers at Config Screen)",
+  "key.rei.category": "Вполне достаточно предметов",
   "text.rei.cheating": "Мошенничество",
   "text.rei.cheating_disabled": "§7Мошенничество выключено",
   "text.rei.cheating_enabled": "§cМошенничество включено",
@@ -10,10 +10,10 @@
   "category.rei.crafting": "Создание",
   "category.rei.smelting": "Плавление",
   "category.rei.smelting.fuel": "Топливо",
-  "category.rei.fuel": "Fuel",
-  "category.rei.fuel.time": "Burn Time: %d ticks",
-  "category.rei.fuel.time_short": "%d ticks",
-  "category.rei.cooking.xp": "%f XP",
+  "category.rei.fuel": "Топливо",
+  "category.rei.fuel.time": "Время горения: %d тактов",
+  "category.rei.fuel.time_short": "%d тактов",
+  "category.rei.cooking.xp": "%f опыта",
   "category.rei.smoking": "Копчение",
   "category.rei.blasting": "Выплавка",
   "category.rei.campfire": "Прожарка",
@@ -96,8 +96,8 @@
   "config.roughlyenoughitems.recipeKeybind": "Показать рецепт:",
   "config.roughlyenoughitems.hideKeybind": "Скрыть/Показать REI:",
   "config.roughlyenoughitems.usageKeybind": "Показать использования:",
-  "config.roughlyenoughitems.nextPageKeybind": "Next Page:",
-  "config.roughlyenoughitems.previousPageKeybind": "Previous Page:",
+  "config.roughlyenoughitems.nextPageKeybind": "Следующая страница:",
+  "config.roughlyenoughitems.previousPageKeybind": "Предыдущая страница:",
   "config.roughlyenoughitems.focusSearchFieldKeybind": "Фокус на поле поиска:",
   "config.roughlyenoughitems.copyRecipeIdentifierKeybind": "Скопировать идентификатор рецепта:",
   "config.roughlyenoughitems.favoriteKeybind": "Закладка:",
@@ -128,8 +128,8 @@
   "config.roughlyenoughitems.disableRecipeBook": "Ванильная книга рецептов:",
   "config.roughlyenoughitems.disableRecipeBook.boolean.true": "Выключено",
   "config.roughlyenoughitems.disableRecipeBook.boolean.false": "Включено",
-  "config.roughlyenoughitems.fixTabCloseContainer": "Fix Vanilla Tab Container (When Recipe Book Disabled):",
-  "config.roughlyenoughitems.lighterButtonHover": "Lighter Button Hover:",
+  "config.roughlyenoughitems.fixTabCloseContainer": "Восстановление стандартной вкладки контейнера (когда книга рецептов отключена):",
+  "config.roughlyenoughitems.lighterButtonHover": "Подвсеченная кнопка при наведении:",
   "config.roughlyenoughitems.enableCraftableOnlyButton": "Фильтр по создаваемым предметам:",
   "config.roughlyenoughitems.enableCraftableOnlyButton.boolean.true": "Включено",
   "config.roughlyenoughitems.enableCraftableOnlyButton.boolean.false": "Выключено",
@@ -159,8 +159,8 @@
   "config.roughlyenoughitems.displayFavoritesOnTheLeft.boolean.true": "Противоположная сторона",
   "config.roughlyenoughitems.displayFavoritesOnTheLeft.boolean.false": "Верх списка",
   "config.roughlyenoughitems.displayFavoritesTooltip": "Показывать подсказки из избранного:",
-  "config.roughlyenoughitems.snapToRows": "Entry List Snap To Rows:",
-  "config.roughlyenoughitems.toastDisplayedOnCopyIdentifier": "Copy Identifier Toast:",
+  "config.roughlyenoughitems.snapToRows": "Список предметов привязан к строкам:",
+  "config.roughlyenoughitems.toastDisplayedOnCopyIdentifier": "Сообщать о копировании идентификатора:",
   "config.roughlyenoughitems.scrollingEntryListWidget": "Режим списка предметов:",
   "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "Прокрутка",
   "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "Кнопки",