aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2020-07-01 00:45:39 +0800
committershedaniel <daniel@shedaniel.me>2020-07-01 00:45:39 +0800
commit07432ff14185f98b79ee66d820ab758432c37177 (patch)
tree9935ad7a58bd5aa6cf8dc45f411433b7ce7e611c /src
parentd1c37f282ea82af014f162b7fbfd8001ca66cab0 (diff)
parentab59fc9bf33965b51f8a8f7ba63f7019dfa712d8 (diff)
downloadRoughlyEnoughItems-07432ff14185f98b79ee66d820ab758432c37177.tar.gz
RoughlyEnoughItems-07432ff14185f98b79ee66d820ab758432c37177.tar.bz2
RoughlyEnoughItems-07432ff14185f98b79ee66d820ab758432c37177.zip
Merge remote-tracking branch 'remotes/shedaniel/l10n_4.x' into 4.x
Diffstat (limited to 'src')
-rw-r--r--src/main/resources/assets/roughlyenoughitems/lang/nn_no.json32
-rw-r--r--src/main/resources/assets/roughlyenoughitems/lang/ru_ru.json8
2 files changed, 20 insertions, 20 deletions
diff --git a/src/main/resources/assets/roughlyenoughitems/lang/nn_no.json b/src/main/resources/assets/roughlyenoughitems/lang/nn_no.json
index b4eda390e..d5a165348 100644
--- a/src/main/resources/assets/roughlyenoughitems/lang/nn_no.json
+++ b/src/main/resources/assets/roughlyenoughitems/lang/nn_no.json
@@ -103,21 +103,21 @@
"_comment": "Config Tooltips",
"config.roughlyenoughitems.title": "Roughly Enough Items Config",
"config.roughlyenoughitems.basics": "Basics",
- "config.roughlyenoughitems.appearance": "Appearance",
+ "config.roughlyenoughitems.appearance": "Utseende",
"config.roughlyenoughitems.functionality": "Functionality",
"config.roughlyenoughitems.advanced": "Advanced",
- "config.roughlyenoughitems.cheating": "Cheating:",
- "config.roughlyenoughitems.favoritesEnabled": "Favorites Enabled:",
+ "config.roughlyenoughitems.cheating": "Cheating: ",
+ "config.roughlyenoughitems.favoritesEnabled": "Favoritter aktivert:",
"config.roughlyenoughitems.keyBindings": "Keybindings",
- "config.roughlyenoughitems.keyBindings.recipeKeybind": "Show Recipe:",
- "config.roughlyenoughitems.keyBindings.hideKeybind": "Hide/Show REI:",
- "config.roughlyenoughitems.keyBindings.usageKeybind": "Show Uses:",
- "config.roughlyenoughitems.keyBindings.nextPageKeybind": "Next Page:",
- "config.roughlyenoughitems.keyBindings.previousPageKeybind": "Previous Page:",
- "config.roughlyenoughitems.keyBindings.focusSearchFieldKeybind": "Focus Search Field:",
- "config.roughlyenoughitems.keyBindings.copyRecipeIdentifierKeybind": "Copy Recipe Identifier:",
- "config.roughlyenoughitems.keyBindings.exportImageKeybind": "Export Recipe:",
- "config.roughlyenoughitems.keyBindings.favoriteKeybind": "Favorite Entry:",
+ "config.roughlyenoughitems.keyBindings.recipeKeybind": "Vis Oppskriften:",
+ "config.roughlyenoughitems.keyBindings.hideKeybind": "Skjul/vis RI:",
+ "config.roughlyenoughitems.keyBindings.usageKeybind": "Vis bruk:",
+ "config.roughlyenoughitems.keyBindings.nextPageKeybind": "Neste side",
+ "config.roughlyenoughitems.keyBindings.previousPageKeybind": "Forrige side",
+ "config.roughlyenoughitems.keyBindings.focusSearchFieldKeybind": "Fokus Søkefeltet:",
+ "config.roughlyenoughitems.keyBindings.copyRecipeIdentifierKeybind": "Kopier oppskriftsidentifikator:",
+ "config.roughlyenoughitems.keyBindings.exportImageKeybind": "Eksporter oppskrift:",
+ "config.roughlyenoughitems.keyBindings.favoriteKeybind": "Favoritt Entry:",
"config.roughlyenoughitems.recipeScreenType": "Recipe Screen Type:",
"config.roughlyenoughitems.recipeScreenType.config": "Recipe Screen Type: %s",
"config.roughlyenoughitems.recipeScreenType.unset": "Not Set",
@@ -128,12 +128,12 @@
"config.roughlyenoughitems.accessibility": "Accessibility",
"config.roughlyenoughitems.search": "Search",
"config.roughlyenoughitems.commands": "Commands",
- "config.roughlyenoughitems.filtering": "Filtering",
+ "config.roughlyenoughitems.filtering": "Filtrering",
"config.roughlyenoughitems.miscellaneous": "Miscellaneous",
- "config.roughlyenoughitems.miscellaneous.clickableRecipeArrows": "Clickable Recipe Arrows:",
+ "config.roughlyenoughitems.miscellaneous.clickableRecipeArrows": "Klikkbare oppskriftspiler:",
"config.roughlyenoughitems.isSubsetsEnabled": "Subsets Enabled:",
- "config.roughlyenoughitems.miscellaneous.renderEntryEnchantmentGlint": "Render Enchantment Glint:",
- "config.roughlyenoughitems.layout.configButtonLocation": "Config Button Position:",
+ "config.roughlyenoughitems.miscellaneous.renderEntryEnchantmentGlint": "Gjengi fortryllelse hint:",
+ "config.roughlyenoughitems.layout.configButtonLocation": "Posisjon for konfigurasjonsknapp:",
"config.roughlyenoughitems.layout.configButtonLocation.upper": "Upper",
"config.roughlyenoughitems.layout.configButtonLocation.lower": "Lower",
"config.roughlyenoughitems.filteredEntries.selectAll": "Select All",
diff --git a/src/main/resources/assets/roughlyenoughitems/lang/ru_ru.json b/src/main/resources/assets/roughlyenoughitems/lang/ru_ru.json
index f9fd87b67..e23e01e6b 100644
--- a/src/main/resources/assets/roughlyenoughitems/lang/ru_ru.json
+++ b/src/main/resources/assets/roughlyenoughitems/lang/ru_ru.json
@@ -102,13 +102,13 @@
"subsets.rei.roughlyenoughitems.item_groups": "Вкладки творчества",
"_comment": "Конфигурация подсказок",
"config.roughlyenoughitems.title": "Конфигурация Roughly Enough Items",
- "config.roughlyenoughitems.basics": "Basics",
+ "config.roughlyenoughitems.basics": "Основа",
"config.roughlyenoughitems.appearance": "Оформление",
- "config.roughlyenoughitems.functionality": "Functionality",
- "config.roughlyenoughitems.advanced": "Advanced",
+ "config.roughlyenoughitems.functionality": "Функционал",
+ "config.roughlyenoughitems.advanced": "Новейший",
"config.roughlyenoughitems.cheating": "Мошенничество:",
"config.roughlyenoughitems.favoritesEnabled": "Избранное включено:",
- "config.roughlyenoughitems.keyBindings": "Keybindings",
+ "config.roughlyenoughitems.keyBindings": "Привязка Клавиш",
"config.roughlyenoughitems.keyBindings.recipeKeybind": "Показать рецепт:",
"config.roughlyenoughitems.keyBindings.hideKeybind": "Скрыть/Показать REI:",
"config.roughlyenoughitems.keyBindings.usageKeybind": "Показать использование:",