Merge remote-tracking branch 'shedaniel/l10n_4.x-unstable' into 4.x-unstable

2 files changed, 32 insertions, 32 deletions

diff --git a/src/main/resources/assets/roughlyenoughitems/lang/de_de.json b/src/main/resources/assets/roughlyenoughitems/lang/de_de.json
index 2fced713f..56c482656 100644
--- a/src/main/resources/assets/roughlyenoughitems/lang/de_de.json
+++ b/src/main/resources/assets/roughlyenoughitems/lang/de_de.json
@@ -12,9 +12,9 @@
   "category.rei.smelting.fuel": "Brennstoff",
   "category.rei.fuel": "Brennstoff",
   "category.rei.fuel.time": "Brenndauer: %d ticks",
-  "category.rei.fuel.time.items": "Burn Time: %s item(s)",
+  "category.rei.fuel.time.items": "Brenndauer: %s Gegenstände",
   "category.rei.fuel.time_short": "%d Ticks",
-  "category.rei.fuel.time_short.items": "%s item(s)",
+  "category.rei.fuel.time_short.items": "%s Gegenstände",
   "category.rei.cooking.xp": "%f XP",
   "category.rei.cooking.time&xp": "%s XP in %s Sek",
   "category.rei.smoking": "Räuchern",
@@ -28,7 +28,7 @@
   "category.rei.brewing.result": "Entstehender Trank",
   "category.rei.composting": "Kompostieren",
   "category.rei.stripping": "Entrinden",
-  "category.rei.beacon_base": "Beacon Base",
+  "category.rei.beacon_base": "Leuchtfeuer-Basis",
   "category.rei.information": "Information",
   "text.rei.composting.chance": "§e%d%% Chance",
   "text.rei.composting.page": "Seite %d",
@@ -89,12 +89,12 @@
   "text.rei.recipe_screen_type.selection.sub": "Du kannst diese Einstellung jederzeit über den Konfigurationsbildschirm wieder bearbeiten.",
   "text.rei.view_recipes_for": "Rezepte für %s anzeigen",
   "text.rei.subsets": "Subsets",
-  "text.rei.tiny_potato": "Tiny Potatoz",
+  "text.rei.tiny_potato": "Kleine Kartöffelchen",
   "tooltip.rei.fluid_amount": "§7%d Einheit",
   "msg.rei.copied_recipe_id": "Rezept-Identifizierer kopiert",
   "msg.rei.recipe_id_details": "Rezept-ID: %s",
-  "subsets.rei.roughlyenoughitems.all_entries": "All Entries",
-  "subsets.rei.roughlyenoughitems.item_groups": "Creative Tabs",
+  "subsets.rei.roughlyenoughitems.all_entries": "Alle Einträge",
+  "subsets.rei.roughlyenoughitems.item_groups": "Kreativ-Inventar-Tabs",
   "_comment": "Konfigurations-Tooltips",
   "config.roughlyenoughitems.title": "Roughly Enough Items Konfiguration",
   "config.roughlyenoughitems.!general": "Allgemein",
@@ -102,8 +102,8 @@
   "config.roughlyenoughitems.modules": "Module",
   "config.roughlyenoughitems.technical": "Technisches",
   "config.roughlyenoughitems.performance": "Performance",
-  "config.roughlyenoughitems.filtering": "Filtering",
-  "config.roughlyenoughitems.experimental": "Experimental Features",
+  "config.roughlyenoughitems.filtering": "Filtern",
+  "config.roughlyenoughitems.experimental": "Experimentelle Funktionen",
   "config.roughlyenoughitems.cheating": "Schummeln:",
   "config.roughlyenoughitems.smooth_scrolling": "Sanftes Scrollen Einstellungen",
   "config.roughlyenoughitems.recipeKeybind": "Zeige Rezept:",
@@ -123,22 +123,22 @@
   "config.roughlyenoughitems.lowerConfigButton": "Position des Konfigurationsknopfes:",
   "config.roughlyenoughitems.lowerConfigButton.boolean.false": "Oben",
   "config.roughlyenoughitems.lowerConfigButton.boolean.true": "Nächster Schritt: Suchen",
-  "config.roughlyenoughitems.filteredEntries.selectAll": "Select All",
-  "config.roughlyenoughitems.filteredEntries.selectNone": "Unselect All",
-  "config.roughlyenoughitems.filteredEntries.hide": "Hide Selected",
-  "config.roughlyenoughitems.filteredEntries.show": "Show Selected",
-  "config.roughlyenoughitems.filteredEntries.loadWorldFirst": "Load World First!",
+  "config.roughlyenoughitems.filteredEntries.selectAll": "Alles Auswählen",
+  "config.roughlyenoughitems.filteredEntries.selectNone": "Alle abwählen",
+  "config.roughlyenoughitems.filteredEntries.hide": "Auswahl verstecken",
+  "config.roughlyenoughitems.filteredEntries.show": "Auswahl anzeigen",
+  "config.roughlyenoughitems.filteredEntries.loadWorldFirst": "Zuerst eine Welt laden!",
   "config.roughlyenoughitems.entrySize": "Eintragsgröße:",
-  "config.roughlyenoughitems.asyncSearch": "Async Search:",
+  "config.roughlyenoughitems.asyncSearch": "Asynchrone Suche",
   "config.roughlyenoughitems.numberAsyncSearch": "Async Entry Group Size:",
   "config.roughlyenoughitems.useCompactTabs": "Kompakte Tabs:",
   "config.roughlyenoughitems.darkTheme": "Erscheinungsbild:",
   "config.roughlyenoughitems.darkTheme.boolean.true": "Dunkles Design",
   "config.roughlyenoughitems.darkTheme.boolean.false": "Helles Design",
   "config.roughlyenoughitems.recipeBorder": "Rand der Rezept-Anzeige:",
-  "config.roughlyenoughitems.recipeBorder.lighter": "Lighter",
-  "config.roughlyenoughitems.recipeBorder.default": "Default",
-  "config.roughlyenoughitems.recipeBorder.none": "None",
+  "config.roughlyenoughitems.recipeBorder.lighter": "Heller",
+  "config.roughlyenoughitems.recipeBorder.default": "Standard",
+  "config.roughlyenoughitems.recipeBorder.none": "Keiner",
   "config.roughlyenoughitems.maxRecipePerPage": "Maximale Anzahl Rezepte pro Seite:",
   "config.roughlyenoughitems.mirrorItemPanel": "Position der Gegenstandsliste:",
   "config.roughlyenoughitems.mirrorItemPanel.boolean.true": "Linke Seite",
@@ -194,18 +194,18 @@
   "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "Bildlauf",
   "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "Mehrere Seiten",
   "text.rei.credit.text": "§lRoughly Enough Items (v%s)\n§7Ursprünglich ein Fork von Almost Enough Items.\n\n§lEntwickler\n  Original von ZenDarva\n  Neu geschrieben von Danielshe\n  Alter Plugin Support von TehNut\n\n§lÜbersetzung\n%s\n\n§lLizenz \n§7Roughly Enough Items ist unter der MIT-Lizenz veröffentlicht.",
-  "language.roughlyenoughitems.english": "English",
-  "language.roughlyenoughitems.japanese": "Japanese",
-  "language.roughlyenoughitems.chinese_simplified": "Chinese Simplified",
-  "language.roughlyenoughitems.chinese_traditional": "Chinese Traditional",
-  "language.roughlyenoughitems.french": "French",
-  "language.roughlyenoughitems.german": "German",
-  "language.roughlyenoughitems.estonian": "Estonian",
-  "language.roughlyenoughitems.portuguese": "Portuguese",
-  "language.roughlyenoughitems.portuguese_brazilian": "Portuguese, Brazilian",
+  "language.roughlyenoughitems.english": "Englisch",
+  "language.roughlyenoughitems.japanese": "Japanisch",
+  "language.roughlyenoughitems.chinese_simplified": "Chinesisch (Vereinfacht)",
+  "language.roughlyenoughitems.chinese_traditional": "Chinesisch (Traditionell)",
+  "language.roughlyenoughitems.french": "Französisch",
+  "language.roughlyenoughitems.german": "Deutsch",
+  "language.roughlyenoughitems.estonian": "Estnisch",
+  "language.roughlyenoughitems.portuguese": "Portugiesisch",
+  "language.roughlyenoughitems.portuguese_brazilian": "Portugiesisch (Brasilianisch)",
   "language.roughlyenoughitems.lolcat": "LOLCAT",
-  "language.roughlyenoughitems.upside_down_english": "Upside Down English",
-  "language.roughlyenoughitems.bulgarian": "Bulgarian",
-  "language.roughlyenoughitems.russian": "Russian",
-  "language.roughlyenoughitems.polish": "Polish"
+  "language.roughlyenoughitems.upside_down_english": "Englisch (verkehrtrum)",
+  "language.roughlyenoughitems.bulgarian": "Bulgarisch",
+  "language.roughlyenoughitems.russian": "Russisch",
+  "language.roughlyenoughitems.polish": "Polnisch"
 }
diff --git a/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json b/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json
index 07669128e..3a1ab80a9 100755
--- a/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json
+++ b/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json
@@ -129,8 +129,8 @@
   "config.roughlyenoughitems.filteredEntries.show": "Afficher",
   "config.roughlyenoughitems.filteredEntries.loadWorldFirst": "Charger d'abord le monde !",
   "config.roughlyenoughitems.entrySize": "Taille des entrées :",
-  "config.roughlyenoughitems.asyncSearch": "Async Search:",
-  "config.roughlyenoughitems.numberAsyncSearch": "Async Entry Group Size:",
+  "config.roughlyenoughitems.asyncSearch": "Recherche Asynchrone :",
+  "config.roughlyenoughitems.numberAsyncSearch": "Taille de groupe de l'entrée Asynchrone :",
   "config.roughlyenoughitems.useCompactTabs": "Onglets compacts :",
   "config.roughlyenoughitems.darkTheme": "Thème d'apparence :",
   "config.roughlyenoughitems.darkTheme.boolean.true": "Thème sombre",